/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-12-16 02:58:31 UTC
  • mto: This revision was merged to the branch mainline in revision 3910.
  • Revision ID: andrew.bennetts@canonical.com-20081216025831-vgwlxfoz7n9b8fyh
Skip test for two formats, and fix format 5 by avoiding a full history sync with non-format5 branches.

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: