~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Mark Hammond
  • Date: 2008-12-28 05:21:23 UTC
  • mfrom: (3920 +trunk)
  • mto: (3932.1.1 prepare-1.11)
  • mto: This revision was merged to the branch mainline in revision 3937.
  • Revision ID: mhammond@skippinet.com.au-20081228052123-f78xs5sbdkotshwf
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
1269
1269
    def __init__(self):
1270
1270
        super(BranchFormatMetadir, self).__init__()
1271
1271
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
 
1272
        self._matchingbzrdir.set_branch_format(self)
1272
1273
 
1273
1274
    def supports_tags(self):
1274
1275
        return True
1424
1425
    def __init__(self):
1425
1426
        super(BranchReferenceFormat, self).__init__()
1426
1427
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
 
1428
        self._matchingbzrdir.set_branch_format(self)
1427
1429
 
1428
1430
    def _make_reference_clone_function(format, a_branch):
1429
1431
        """Create a clone() routine for a branch dynamically."""
1612
1614
        :param revision_id: The revision-id to truncate history at.  May
1613
1615
          be None to copy complete history.
1614
1616
        """
 
1617
        if not isinstance(destination._format, BzrBranchFormat5):
 
1618
            super(BzrBranch, self)._synchronize_history(
 
1619
                destination, revision_id)
 
1620
            return
1615
1621
        if revision_id == _mod_revision.NULL_REVISION:
1616
1622
            new_history = []
1617
1623
        else: