/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/upstream_import.py

  • Committer: Jelmer Vernooij
  • Date: 2020-08-10 15:00:17 UTC
  • mfrom: (7490.40.99 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200810150017-vs7xnrd1vat4iktg
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/upstream_import.py
33
33
from .osutils import (pathjoin, isdir, file_iterator, basename,
34
34
                      file_kind, splitpath)
35
35
from .trace import warning
36
 
from .transform import resolve_conflicts, cook_conflicts
 
36
from .transform import resolve_conflicts
37
37
from .transport import get_transport
38
38
from .workingtree import WorkingTree
39
39
 
300
300
    for path in removed.difference(added):
301
301
        tt.unversion_file(tt.trans_id_tree_path(path))
302
302
 
303
 
    for conflict in cook_conflicts(resolve_conflicts(tt), tt):
 
303
    for conflict in tt.cook_conflicts(resolve_conflicts(tt)):
304
304
        warning(conflict)
305
305
 
306
306