/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/builtins.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
61
61
    views,
62
62
    )
63
63
from breezy.branch import Branch
64
 
from breezy.conflicts import ConflictList
65
64
from breezy.transport import memory
66
65
from breezy.smtp_connection import SMTPConnection
67
66
from breezy.workingtree import WorkingTree
4820
4819
            restore_files = [c.path for c in conflicts
4821
4820
                             if c.typestring in allowed_conflicts]
4822
4821
        _mod_merge.transform_tree(tree, tree.basis_tree(), interesting_files)
4823
 
        tree.set_conflicts(ConflictList(new_conflicts))
 
4822
        tree.set_conflicts(new_conflicts)
4824
4823
        if file_list is not None:
4825
4824
            restore_files = file_list
4826
4825
        for filename in restore_files: