/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/git/object_store.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-13 23:57:28 UTC
  • mfrom: (7490 work)
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200213235728-m6ds0mm3mbs4y182
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/object_store.py
42
42
    osutils,
43
43
    ui,
44
44
    )
45
 
from ..tree import find_previous_path
46
45
from ..lock import LogicalLockResult
47
46
from ..revision import (
48
47
    NULL_REVISION,
49
48
    )
 
49
from ..tree import InterTree
50
50
from ..bzr.testament import (
51
51
    StrictTestament3,
52
52
    )
230
230
 
231
231
    def find_unchanged_parent_ie(path, kind, other, parent_trees):
232
232
        for ptree in parent_trees:
233
 
            ppath = find_previous_path(tree, ptree, path)
 
233
            intertree = InterTree.get(ptree, tree)
 
234
            ppath = intertree.find_source_path(path)
234
235
            if ppath is not None:
235
236
                pkind = ptree.kind(ppath)
236
237
                if kind == "file":