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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-24 00:53:02 UTC
  • mfrom: (6883.7.16 cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20180324005302-z0eh8ftsz57804cg
Avoid using file ids in a couple more places.

Merged from https://code.launchpad.net/~jelmer/brz/cleanups/+merge/341360

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
3102
3102
        elif c_type == 'unversioned parent':
3103
3103
            file_id = tt.inactive_file_id(conflict[1])
3104
3104
            # special-case the other tree root (move its children instead)
3105
 
            if path_tree and path_tree.has_id(file_id):
3106
 
                if path_tree.path2id('') == file_id:
 
3105
            if path_tree and path_tree.path2id('') == file_id:
3107
3106
                    # This is the root entry, skip it
3108
3107
                    continue
3109
3108
            tt.version_file(file_id, conflict[1])