/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/workingtree_4.py

  • Committer: Alexander Belchenko
  • Date: 2007-11-15 20:39:56 UTC
  • mfrom: (2998 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2999.
  • Revision ID: bialix@ukr.net-20071115203956-rk1pyelb2h93c5dy
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1255
1255
        """See WorkingTreeFormat.get_format_description()."""
1256
1256
        return "Working tree format 4"
1257
1257
 
1258
 
    def initialize(self, a_bzrdir, revision_id=None):
 
1258
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None):
1259
1259
        """See WorkingTreeFormat.initialize().
1260
1260
 
1261
1261
        :param revision_id: allows creating a working tree at a different
1271
1271
        control_files.create_lock()
1272
1272
        control_files.lock_write()
1273
1273
        control_files.put_utf8('format', self.get_format_string())
1274
 
        branch = a_bzrdir.open_branch()
 
1274
        if from_branch is not None:
 
1275
            branch = from_branch
 
1276
        else:
 
1277
            branch = a_bzrdir.open_branch()
1275
1278
        if revision_id is None:
1276
1279
            revision_id = branch.last_revision()
1277
1280
        local_path = transport.local_abspath('dirstate')