← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-12-17 10:21:38 UTC
  • mfrom: (3904.3.9 broken-stacking-fix)
  • Revision ID: pqm@pqm.ubuntu.com-20081217102138-pz7pfli9o3k50zq7
Fix pushing an unstackable branch + stackable repo when there is a
        default stacking policy. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1614
1614
        :param revision_id: The revision-id to truncate history at.  May
1615
1615
          be None to copy complete history.
1616
1616
        """
 
1617
        if not isinstance(destination._format, BzrBranchFormat5):
 
1618
            super(BzrBranch, self)._synchronize_history(
 
1619
                destination, revision_id)
 
1620
            return
1617
1621
        if revision_id == _mod_revision.NULL_REVISION:
1618
1622
            new_history = []
1619
1623
        else: