Rev 5133: Reproduce bug #805809. in file:///home/vila/src/bzr/bugs/805809-no-final-path/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/805809-no-final-path/

------------------------------------------------------------
revno: 5133
revision-id: v.ladeuil+lp at free.fr-20110705085540-ljghf85lnvwcno9m
parent: pqm at pqm.ubuntu.com-20110525182215-rdt09veh6tfzmril
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 805809-no-final-path
timestamp: Tue 2011-07-05 10:55:40 +0200
message:
  Reproduce bug #805809.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2011-01-14 21:35:52 +0000
+++ b/bzrlib/tests/test_conflicts.py	2011-07-05 08:55:40 +0000
@@ -1049,6 +1049,72 @@
 """)
 
 
+class TestNoFinalPath(script.TestCaseWithTransportAndScript):
+
+    def test_bug_805809(self):
+        self.run_script("""
+$ bzr init trunk
+Created a standalone tree (format: 2a)
+$ cd trunk
+$ echo trunk >file
+$ bzr add
+adding file
+$ bzr commit -m 'create file on trunk'
+2>Committing to: .../trunk/
+2>added file
+2>Committed revision 1.
+$ cd ..
+$ bzr branch trunk -r 1 debian
+2>Branched 1 revision(s).
+$ cd debian
+$ mkdir dir
+$ bzr add
+adding dir
+$ bzr mv file dir
+file => dir/file
+$ bzr commit -m 'rename file to dir/file for debian'
+2>Committing to: .../debian/
+2>added dir
+2>renamed file => dir/file
+2>Committed revision 2.
+$ cd ..
+$ bzr init experimental
+$ cd experimental
+$ bzr merge ../debian -r0..2
+2>+N  dir/
+2>+N  dir/file
+2>All changes applied successfully.
+$ bzr commit -m 'merging debian in experimental'
+2>Committing to: .../experimental/
+2>deleted 
+2>modified dir
+2>Committed revision 1.
+# Create a new branch to get a different root-id
+$ cd ..
+$ bzr init ubuntu
+$ cd ubuntu
+$ echo ubuntu >irrelevant
+$ bzr add
+adding irrelevant
+$ bzr commit -m 'create irrelevant in ubuntu'
+2>Committing to: .../ubuntu/
+2>added irrelevant
+2>Committed revision 1.
+$ bzr merge ../debian -r0..2
+2>+N  dir/
+2>+N  dir/file
+2>All changes applied successfully.
+$ bzr commit -m 'merging debian'
+2>Committing to: .../ubuntu/
+2>added dir
+2>added dir/file
+2>Committed revision 2.
+$ bzr merge ../experimental
+2>Path conflict: dir / dir
+2>1 conflicts encountered.
+""")
+
+
 class TestResolveActionOption(tests.TestCase):
 
     def setUp(self):