Viewing all changes in revision 5582.10.55.
- Committer: Jelmer Vernooij
- Date: 2011-02-19 13:22:05 UTC
- mfrom: (5670 +trunk)
- mto: (5582.12.2 weave-plugin)
- mto: This revision was merged to the branch mainline in revision 5718.
- Revision ID: jelmer@samba.org-20110219132205-ujm0q9yu4893daa8
merge bzr.dev
- files added:
- bzrlib/plugins/weave_fmt/branch.py
- files removed:
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/tests/per_repository_vf
- files renamed:
- 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:
- bzrlib/__init__.py
expand all
collapse all
added
removed
