← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Merge old-hpss-branch-implementation-test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
419
419
            merge = self.make_merger()
420
420
            merge.do_merge()
421
421
            if self.recurse == 'down':
422
 
                for path, file_id in self.this_tree.iter_references():
423
 
                    sub_tree = self.this_tree.get_nested_tree(file_id, path)
 
422
                for relpath, file_id in self.this_tree.iter_references():
 
423
                    sub_tree = self.this_tree.get_nested_tree(file_id, relpath)
424
424
                    other_revision = self.other_tree.get_reference_revision(
425
 
                        file_id, path)
 
425
                        file_id, relpath)
426
426
                    if  other_revision == sub_tree.last_revision():
427
427
                        continue
428
428
                    sub_merge = Merger(sub_tree.branch, this_tree=sub_tree)
429
429
                    sub_merge.merge_type = self.merge_type
430
 
                    relpath = self.this_tree.relpath(path)
431
430
                    other_branch = self.other_branch.reference_parent(file_id, relpath)
432
431
                    sub_merge.set_other_revision(other_revision, other_branch)
433
432
                    base_revision = self.base_tree.get_reference_revision(file_id)