← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2009-04-14 15:02:46 UTC
  • mto: This revision was merged to the branch mainline in revision 4302.
  • Revision ID: aaron@aaronbentley.com-20090414150246-6xfd3bwwf2m8v4px
Cleanup

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
 
        self.other_branch.update_references(self.this_branch)
 
465
        if self.other_branch is not None:
 
466
            self.other_branch.update_references(self.this_branch)
466
467
        merge.do_merge()
467
468
        if self.recurse == 'down':
468
469
            for relpath, file_id in self.this_tree.iter_references():