~bzr-pqm/bzr/bzr.dev
Viewing all changes in revision 6027.1.12.
-
Committer:
Vincent Ladeuil
-
Date:
2012-03-13 17:25:29 UTC
-
mfrom:
(6499 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6501.
-
Revision ID:
v.ladeuil+lp@free.fr-20120313172529-i0suyjnepsor25i7
Merge trunk
-
bzrlib/plugins/changelog_merge
-
bzrlib/plugins/changelog_merge/tests
-
bzrlib/plugins/po_merge/tests
-
bzrlib/plugins/weave_fmt/tests
-
bzrlib/tests/per_repository_vf
- files removed:
-
bzrlib/benchmarks
-
bzrlib/benchmarks/tree_creator
-
bzrlib/tests/per_bzrdir/
=>
bzrlib/tests/per_controldir/
-
bzrlib/tests/per_bzrdir_colo/
=>
bzrlib/tests/per_controldir_colo/
-
bzrlib/tests/per_repository/helpers.py
=>
bzrlib/tests/per_repository_vf/helpers.py
expand all
collapse all
Show diffs side-by-side
added
removed