~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Robert Collins
  • Date: 2005-09-29 02:01:49 UTC
  • Revision ID: robertc@robertcollins.net-20050929020149-1ff16722c6a01b2c
reenable remotebranch tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
203
203
        if (self._branch_format != branch_to._branch_format
204
204
            or self._branch_format != 4):
205
205
            from bzrlib.fetch import greedy_fetch
206
 
            mutter("falling back to fetch logic to push between %s and %s",
207
 
                   self, branch_to)
 
206
            mutter("falling back to fetch logic to push between %s(%s) and %s(%s)",
 
207
                   self, self._branch_format, branch_to, branch_to._branch_format)
208
208
            greedy_fetch(to_branch=branch_to, from_branch=self,
209
209
                         revision=self.last_revision())
210
210
            return
1365
1365
    assert isinstance(to_location, basestring)
1366
1366
    
1367
1367
    br_to = Branch.initialize(to_location)
 
1368
    mutter("copy branch from %s to %s", branch_from, br_to)
1368
1369
    if basis_branch is not None:
1369
1370
        basis_branch.push_stores(br_to)
1370
1371
    br_to.set_root_id(branch_from.get_root_id())
1374
1375
    merge((to_location, -1), (to_location, 0), this_dir=to_location,
1375
1376
          check_clean=False, ignore_zero=True)
1376
1377
    br_to.set_parent(branch_from.base)
 
1378
    mutter("copied")
1377
1379
    return br_to