/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-10-29 11:27:33 UTC
  • mto: This revision was merged to the branch mainline in revision 7170.
  • Revision ID: jelmer@jelmer.uk-20181029112733-bjvm24z12svwl53m
Get rid of file_ids in most of Tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/workingtree.py
1289
1289
            for conflict in self.conflicts():
1290
1290
                path = self.id2path(conflict.file_id)
1291
1291
                if (conflict.typestring != 'text conflict' or
1292
 
                    self.kind(path, conflict.file_id) != 'file'):
 
1292
                    self.kind(path) != 'file'):
1293
1293
                    un_resolved.append(conflict)
1294
1294
                    continue
1295
1295
                with open(self.abspath(path), 'rb') as my_file: