/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/plugins/weave_fmt/workingtree.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/plugins/weave_fmt/workingtree.py
27
27
    transform,
28
28
    )
29
29
from ...bzr import (
 
30
    conflicts as _mod_bzr_conflicts,
30
31
    inventory,
31
32
    xml5,
32
33
    )
41
42
 
42
43
 
43
44
def get_conflicted_stem(path):
44
 
    for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
 
45
    for suffix in _mod_bzr_conflicts.CONFLICT_SUFFIXES:
45
46
        if path.endswith(suffix):
46
47
            return path[:-len(suffix)]
47
48
 
230
231
                            break
231
232
                ctype = {True: 'text conflict',
232
233
                         False: 'contents conflict'}[text]
233
 
                conflicts.append(_mod_conflicts.Conflict.factory(ctype,
 
234
                conflicts.append(_mod_bzr_conflicts.Conflict.factory(ctype,
234
235
                                                                 path=conflicted,
235
236
                                                                 file_id=self.path2id(conflicted)))
236
237
            return conflicts