← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Andrew Bennetts
  • Date: 2010-03-19 00:31:54 UTC
  • mto: This revision was merged to the branch mainline in revision 5117.
  • Revision ID: andrew.bennetts@canonical.com-20100319003154-4a3a5vazekn5lvtx
Make report_activity param of read_bytes_from_socket optional.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1094
1094
        tree_transport = self.bzrdir.root_transport.clone(sub_path)
1095
1095
        if tree_transport.base != branch_transport.base:
1096
1096
            tree_bzrdir = format.initialize_on_transport(tree_transport)
1097
 
            branch.BranchReferenceFormat().initialize(tree_bzrdir,
1098
 
                target_branch=new_branch)
 
1097
            branch.BranchReferenceFormat().initialize(tree_bzrdir, new_branch)
1099
1098
        else:
1100
1099
            tree_bzrdir = branch_bzrdir
1101
1100
        wt = tree_bzrdir.create_workingtree(_mod_revision.NULL_REVISION)