← 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/tests/blackbox/test_lookup_revision.py

Committer: Martin
Date: 2011-05-26 21:02:47 UTC
mfrom: (5920 +trunk)
mto: (6221.1.6 parallel_fork_broken_child_804130)
mto: This revision was merged to the branch mainline in revision 6209.
Revision ID: gzlist@googlemail.com-20110526210247-gphqvswf6c7u89xb

Merge bzr.dev to resolve conflicts

files removed:
bzrlib/tests/blackbox/test_breakin.py

files modified:
bzrlib/__init__.py

bzrlib/branch.py

bzrlib/tests/blackbox/__init__.py

bzrlib/tests/test_branch.py

bzrlib/tests/test_config.py

bzrlib/tests/test_dirstate.py

doc/developers/revision-properties.txt

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

Show diffs side-by-side

added added

removed removed

bzrlib/tests/blackbox/test_lookup_revision.py

Older »