To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4634.149.2.
- Committer: Vincent Ladeuil
- Date: 2010-04-01 14:06:48 UTC
- mto: (4634.139.8 2.0)
- mto: This revision was merged to the branch mainline in revision 5160.
- Revision ID: v.ladeuil+lp@free.fr-20100401140648-rw1l4smjcer1h4h3
Reproduce bug #373898.
* bzrlib/tests/per_workingtree/test_merge_from_branch.py:
(TestMergeFromBranch): Smallest test reproducing bug #373898, after an
independant branch has been merged, renaming a file from the imported
root and then deleteing it triggers the tree transform bug. Some more
tests to help ensure the fix will not regress on other cases.
* bzrlib/tests/per_workingtree/test_merge_from_branch.py:
(TestMergeFromBranch): Smallest test reproducing bug #373898, after an
independant branch has been merged, renaming a file from the imported
root and then deleteing it triggers the tree transform bug. Some more
tests to help ensure the fix will not regress on other cases.
- files modified:
- bzrlib/tests/per_workingtree/test_merge_from_branch.py
expand all
collapse all
added
removed
