Rev 5134: Slightly simpler test. 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: 5134
revision-id: v.ladeuil+lp at free.fr-20110705090205-vduyrqt0llpaks8w
parent: v.ladeuil+lp at free.fr-20110705085540-ljghf85lnvwcno9m
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 805809-no-final-path
timestamp: Tue 2011-07-05 11:02:05 +0200
message:
  Slightly simpler test.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2011-07-05 08:55:40 +0000
+++ b/bzrlib/tests/test_conflicts.py	2011-07-05 09:02:05 +0000
@@ -1063,6 +1063,7 @@
 2>Committing to: .../trunk/
 2>added file
 2>Committed revision 1.
+# Create a debian branch based on trunk
 $ cd ..
 $ bzr branch trunk -r 1 debian
 2>Branched 1 revision(s).
@@ -1077,38 +1078,35 @@
 2>added dir
 2>renamed file => dir/file
 2>Committed revision 2.
+# Create an experimental branch with a new root-id
 $ cd ..
 $ bzr init experimental
 $ cd experimental
+# merge debian even without a common ancestor
 $ bzr merge ../debian -r0..2
 2>+N  dir/
 2>+N  dir/file
 2>All changes applied successfully.
-$ bzr commit -m 'merging debian in experimental'
+$ bzr commit -m 'merging debian into experimental'
 2>Committing to: .../experimental/
 2>deleted 
 2>modified dir
 2>Committed revision 1.
-# Create a new branch to get a different root-id
+# Create an ubuntu branch with yet another 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.
+# Also merge debian
 $ 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.
+2>deleted 
+2>modified dir
+2>Committed revision 1.
+# Now try to merge experimental
 $ bzr merge ../experimental
 2>Path conflict: dir / dir
 2>1 conflicts encountered.