Viewing all changes in revision 5535.1.1.
- Committer: Andrew Bennetts
- Date: 2010-11-10 02:01:33 UTC
- mfrom: (5050.45.9 2.2)
- mto: This revision was merged to the branch mainline in revision 5536.
- Revision ID: andrew.bennetts@canonical.com-20101110020133-n6ym1tbhmozyshl5
Merge lp:bzr/2.2, resolving run_script syntax conflicts and resyncing 2.2.2's release notes.
- files added:
- bzrlib/deprecated_graph.py
- files removed:
- bzrlib/cethread.py
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_repository_vf
- po
- files renamed:
- bzrlib/plugins/weave_fmt/repository.py => bzrlib/repofmt/weaverepo.py
- bzrlib/commit_signature_commands.py => bzrlib/sign_my_commits.py
- bzrlib/tests/per_repository_vf/helpers.py => bzrlib/tests/per_repository/helpers.py
- bzrlib/tests/per_repository_vf/test__generate_text_key_index.py => bzrlib/tests/per_repository/test__generate_text_key_index.py
- bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py => bzrlib/tests/per_repository/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository_vf/test_check_reconcile.py => bzrlib/tests/per_repository/test_check_reconcile.py
- bzrlib/tests/per_repository_vf/test_find_text_key_references.py => bzrlib/tests/per_repository/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_locking.py => bzrlib/tests/per_repository/test_is_write_locked.py
- bzrlib/plugins/weave_fmt/xml4.py => bzrlib/xml4.py
- files modified:
- .testr.conf
expand all
collapse all
added
removed
doc/en/_static/en/bzr-en-quick-reference.png
doc/en/_static/en/bzr-en-quick-reference.svg
