To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Vincent Ladeuil
- Date: 2010-04-01 14:06:48 UTC
- mto: (4634.139.8 2.0)
- 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.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
index-plain.txt |
4634.39.36 | 16 years ago | Ian Clatworthy | Get plain-style documentation generation working a | 2.8 KB |
|
|
|
index.txt |
4634.39.13 | 16 years ago | Ian Clatworthy | PDF generation for Spanish docs | 2.8 KB |
|
|
|
resolving_conflicts.txt |
3405.2.11 | 17 years ago | Martin Albisetti | * Added Makefile for spanish docs * Created the | 7.2 KB |
|
|
|
version_info.txt |
3405.2.3 | 17 years ago | Martin Albisetti | Added version info translation to spanish | 2 KB |
|
|