/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/branch.py

  • Committer: Andrew Bennetts
  • Date: 2008-05-23 07:17:40 UTC
  • mto: This revision was merged to the branch mainline in revision 3451.
  • Revision ID: andrew.bennetts@canonical.com-20080523071740-j0j21f8pr6xogzo8
Fix bug 234229 by deleting some code :)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1670
1670
        result.source_branch = self
1671
1671
        result.target_branch = target
1672
1672
        result.old_revno, result.old_revid = target.last_revision_info()
1673
 
        try:
1674
 
            target.update_revisions(self, stop_revision)
1675
 
        except errors.DivergedBranches:
1676
 
            if not overwrite:
1677
 
                raise
1678
 
        if overwrite:
1679
 
            target.set_revision_history(self.revision_history())
 
1673
        target.update_revisions(self, stop_revision, overwrite)
1680
1674
        result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
1681
1675
        result.new_revno, result.new_revid = target.last_revision_info()
1682
1676
        return result