← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-23 20:47:30 UTC
  • mfrom: (4273.1.15 branch-subtree-locations)
  • Revision ID: pqm@pqm.ubuntu.com-20090423204730-kcbq9na0n3zs2y3l
(abentley) store tree-references in a new branch format.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
462
462
                               **kwargs)
463
463
 
464
464
    def _do_merge_to(self, merge):
 
465
        if self.other_branch is not None:
 
466
            self.other_branch.update_references(self.this_branch)
465
467
        merge.do_merge()
466
468
        if self.recurse == 'down':
467
469
            for relpath, file_id in self.this_tree.iter_references():