← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

Committer: Jelmer Vernooij
Date: 2011-02-18 20:28:34 UTC
mfrom: (5669 +trunk)
mto: (5582.12.2 weave-plugin)
mto: This revision was merged to the branch mainline in revision 5718.
Revision ID: jelmer@samba.org-20110218202834-bqxa4075evgn7kdp

merge bzr.dev.

files renamed:
bzrlib/thread.py => bzrlib/cethread.py

bzrlib/tests/test_thread.py => bzrlib/tests/test_cethread.py

files modified:
bzrlib/branch.py

bzrlib/builtins.py

bzrlib/bzrdir.py

bzrlib/controldir.py

bzrlib/decorators.py

bzrlib/export/zip_exporter.py

bzrlib/groupcompress.py

bzrlib/hooks.py

bzrlib/knit.py

bzrlib/plugins/launchpad/__init__.py

bzrlib/plugins/launchpad/lp_api.py

bzrlib/plugins/weave_fmt/workingtree.py

bzrlib/tests/__init__.py

bzrlib/tests/blackbox/test_branch.py

bzrlib/tests/blackbox/test_export.py

bzrlib/tests/blackbox/test_pull.py

bzrlib/tests/fixtures.py

bzrlib/tests/per_branch/test_pull.py

bzrlib/tests/per_branch/test_stacking.py

bzrlib/tests/per_controldir/test_controldir.py

bzrlib/tests/per_repository_reference/test_graph.py

bzrlib/tests/per_workingtree/test_pull.py

bzrlib/tests/test_decorators.py

bzrlib/tests/test_hooks.py

bzrlib/tests/test_http.py

bzrlib/tests/test_server.py

bzrlib/version_info_formats/format_rio.py

bzrlib/versionedfile.py

bzrlib/workingtree.py

bzrlib/workingtree_4.py

doc/en/release-notes/bzr-2.4.txt

doc/en/user-guide/hooks.txt

Show diffs side-by-side

added added

removed removed

bzrlib/workingtree_4.py

1406

1406

1407

1407

class DirStateWorkingTreeFormat(WorkingTreeFormat3):

1408

1408

1409

missing_parent_conflicts = True

1410

1409

1411

def initialize(self, a_bzrdir, revision_id=None, from_branch=None,

1410

1412

accelerator_tree=None, hardlink=False):

1411

1413

"""See WorkingTreeFormat.initialize().

Older »