← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2008-06-25 10:06:48 UTC
  • mfrom: (3509 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3510.
  • Revision ID: mbp@sourcefrog.net-20080625100648-ac20jxcm3ojucuby
merge trunk; remove RemoteToOtherFetcher

Show diffs side-by-side

added added

removed removed

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