/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: 2018-07-15 18:45:17 UTC
  • mto: (7045.3.3 python3-r)
  • mto: This revision was merged to the branch mainline in revision 7047.
  • Revision ID: jelmer@jelmer.uk-20180715184517-1ipa50jg36zvglc5
Fix another 300 tests.

Show diffs side-by-side

added added

removed removed

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