Viewing all changes in revision 5425.4.16.
- Committer: Martin Pool
- Date: 2011-05-26 23:57:26 UTC
- mfrom: (5922 +trunk)
- mto: (5425.4.19 220464-stale-locks)
- mto: This revision was merged to the branch mainline in revision 5970.
- Revision ID: mbp@sourcefrog.net-20110526235726-cal6991rsqi99znr
resolve conflicts against trunk
- files added:
- bzrlib/export_pot.py
- po
- files removed:
- bzrlib/deprecated_graph.py
- files renamed:
- bzrlib/tests/per_repository/test_is_write_locked.py => bzrlib/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => bzrlib/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => bzrlib/tests/per_repository_vf/test_find_text_key_references.py
- files modified:
- Makefile
expand all
collapse all
added
removed
doc/en/_static/en/bzr-en-quick-reference.png
doc/en/_static/en/bzr-en-quick-reference.svg
