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

Merge tree reference fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/fetch.py
55
55
from ..bzr.testament import (
56
56
    StrictTestament3,
57
57
    )
 
58
from ..tree import find_previous_path
58
59
from ..tsort import (
59
60
    topo_sort,
60
61
    )
125
126
    # Check what revision we should store
126
127
    parent_keys = []
127
128
    for ptree in parent_bzr_trees:
128
 
        try:
129
 
            ppath = ptree.id2path(file_id)
130
 
        except errors.NoSuchId:
 
129
        ppath = find_previous_path(base_bzr_tree, ptree, decoded_path, file_id)
 
130
        if ppath is None:
131
131
            continue
132
132
        pkind = ptree.kind(ppath)
133
133
        if (pkind == ie.kind and