/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 bzrlib/merge.py

  • Committer: Robert J. Tanner
  • Date: 2009-04-30 22:40:42 UTC
  • mfrom: (4323 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4324.
  • Revision ID: tanner@real-time.com-20090430224042-53v45axtue5bw45l
Merge 1.14.1 back to trunk

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():