~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Vincent Ladeuil
  • Date: 2010-11-24 16:01:57 UTC
  • mfrom: (4597.13.7 cleanup)
  • mto: This revision was merged to the branch mainline in revision 5558.
  • Revision ID: v.ladeuil+lp@free.fr-20101124160157-kieuslo7wj9abdmb
Merge cleanup into 638451-malformed

Show diffs side-by-side

added added

removed removed

Lines of Context:
3355
3355
        if isinstance(format, remote.RemoteBranchFormat):
3356
3356
            format._ensure_real()
3357
3357
            return format._custom_format
3358
 
        return format                                                                                                  
 
3358
        return format
3359
3359
 
3360
3360
    @needs_write_lock
3361
3361
    def copy_content_into(self, revision_id=None):