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

  • Committer: Jelmer Vernooij
  • Date: 2018-02-18 15:49:32 UTC
  • mfrom: (6857 trunk)
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180218154932-q0ihqx714ms38j2u
Merge trink.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/rename_map.py
146
146
            while True:
147
147
                child = path
148
148
                path = osutils.dirname(path)
149
 
                if self.tree.path2id(path) is not None:
 
149
                if self.tree.is_versioned(path):
150
150
                    break
151
151
                required_parents.setdefault(path, []).append(child)
152
152
        require_ids = {}