« back to all changes in this revision
Viewing changes to bzrlib/tests/test_chk_map.py
- Committer: John Arbash Meinel
- Date: 2010-09-25 20:08:01 UTC
- mfrom: (5444 +trunk)
- mto: This revision was merged to the branch mainline in revision 5445.
- Revision ID: john@arbash-meinel.com-20100925200801-7uf0ux3uwxo9i3x0
Merge bzr.dev 5444 to resolve some small text conflicts.
- files removed:
- NEWS
- 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:
- doc/en/release-notes/bzr-2.3.txt => NEWS
- doc/en/release-notes/release-template.txt => NEWS-template.txt
- bzrlib/plugins/weave_fmt/repository.py => bzrlib/repofmt/weaverepo.py
- bzrlib/tests/per_repository_vf/helpers.py => bzrlib/tests/per_repository/helpers.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/plugins/weave_fmt/xml4.py => bzrlib/xml4.py
- files modified:
- .bzrignore
added
removed
bzrlib/tests/test_chk_map.py
