← 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/bzrdir.py

Committer: Jelmer Vernooij
Date: 2011-02-24 16:34:05 UTC
mfrom: (5684 +trunk)
mto: (5582.12.2 weave-plugin)
mto: This revision was merged to the branch mainline in revision 5718.
Revision ID: jelmer@samba.org-20110224163405-l32faomaogqaslm1

merge bzr.dev.

files modified:
bzrlib/bugtracker.py

bzrlib/bzrdir.py

bzrlib/config.py

bzrlib/controldir.py

bzrlib/errors.py

bzrlib/help_topics/en/configuration.txt

bzrlib/osutils.py

bzrlib/plugins/weave_fmt/bzrdir.py

bzrlib/tests/__init__.py

bzrlib/tests/per_branch/test_push.py

bzrlib/tests/per_branch/test_stacking.py

bzrlib/tests/per_controldir/test_controldir.py

bzrlib/tests/per_repository/test_repository.py

bzrlib/tests/test_config.py

bzrlib/tests/test_selftest.py

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

doc/en/whats-new/whats-new-in-2.4.txt

Show diffs side-by-side

added added

removed removed

bzrlib/bzrdir.py

1466

1466

1467

1467

_lock_class = lockdir.LockDir

1468

1468

1469

fixed_components = False

1470

1469

1471

def __init__(self):

1470

1472

self._workingtree_format = None

1471

1473

self._branch_format = None

Older »