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

  • Committer: Jelmer Vernooij
  • Date: 2019-01-01 21:56:21 UTC
  • mto: This revision was merged to the branch mainline in revision 7231.
  • Revision ID: jelmer@jelmer.uk-20190101215621-zixnuiz66fthk46d
Fix tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/workingtree.py
1284
1284
            resolved = _mod_conflicts.ConflictList()
1285
1285
            conflict_re = re.compile(b'^(<{7}|={7}|>{7})')
1286
1286
            for conflict in self.conflicts():
1287
 
                path = conflict.path
 
1287
                path = self.id2path(conflict.file_id)
1288
1288
                if (conflict.typestring != 'text conflict' or
1289
1289
                        self.kind(path) != 'file'):
1290
1290
                    un_resolved.append(conflict)