← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Patch Queue Manager
  • Date: 2012-01-23 15:31:35 UTC
  • mfrom: (6443.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20120123153135-8v3r3z1lx055vmpl
(jelmer) Merge the 2.5 series branch. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2420
2420
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
2421
2421
        if tree_transport.base != branch_transport.base:
2422
2422
            tree_bzrdir = format.initialize_on_transport(tree_transport)
2423
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
2424
 
                target_branch=new_branch)
 
2423
            tree_bzrdir.set_branch_reference(new_branch)
2425
2424
        else:
2426
2425
            tree_bzrdir = branch_bzrdir
2427
2426
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)