← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_3.py

  • Committer: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_3.py
18
18
 
19
19
"""
20
20
 
 
21
from __future__ import absolute_import
 
22
 
21
23
import errno
22
24
 
23
25
from bzrlib import (
193
195
        control_files = self._open_control_files(a_bzrdir)
194
196
        control_files.create_lock()
195
197
        control_files.lock_write()
196
 
        transport.put_bytes('format', self.get_format_string(),
 
198
        transport.put_bytes('format', self.as_string(),
197
199
            mode=a_bzrdir._get_file_mode())
198
200
        if from_branch is not None:
199
201
            branch = from_branch