← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-01-14 20:52:48 UTC
  • mto: This revision was merged to the branch mainline in revision 5614.
  • Revision ID: jelmer@samba.org-20110114205248-f6gvj688732kjoqv
https://launchpad.net/bugs/386576
Fix 'bzr push --overwrite -rOLD_MAINLINE_REV'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
2664
2664
        result.target_branch = target
2665
2665
        result.old_revno, result.old_revid = target.last_revision_info()
2666
2666
        self.update_references(target)
2667
 
        if result.old_revid != self.last_revision():
 
2667
        if result.old_revid != stop_revision:
2668
2668
            # We assume that during 'push' this repository is closer than
2669
2669
            # the target.
2670
2670
            graph = self.repository.get_graph(target.repository)