Rev 5140: Fix the test for trunk where merging into an empty branch now behave differently 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: 5140
revision-id: v.ladeuil+lp at free.fr-20110707102059-xze39u9kino70aqg
parent: v.ladeuil+lp at free.fr-20110707101900-b0mxc2cnwu2dql97
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 805809-no-final-path
timestamp: Thu 2011-07-07 12:20:59 +0200
message:
  Fix the test for trunk where merging into an empty branch now behave differently
-------------- next part --------------
=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2011-07-06 09:22:00 +0000
+++ b/bzrlib/tests/test_conflicts.py	2011-07-07 10:20:59 +0000
@@ -1097,6 +1097,15 @@
 $ bzr init experimental
 Created a standalone tree (format: 2a)
 $ cd experimental
+# Work around merging into empty branch not being supported
+# (http://pad.lv/308562)
+$ echo something >not-empty
+$ bzr add
+adding not-empty
+$ bzr commit -m 'Add some content in experimental'
+2>Committing to: .../experimental/
+2>added not-empty
+2>Committed revision 1.
 # merge debian even without a common ancestor
 $ bzr merge ../debian -r0..2
 2>+N  dir/
@@ -1104,14 +1113,23 @@
 2>All changes applied successfully.
 $ bzr commit -m 'merging debian into experimental'
 2>Committing to: .../experimental/
-2>deleted 
-2>modified dir
-2>Committed revision 1.
+2>added dir
+2>added dir/file
+2>Committed revision 2.
 # Create an ubuntu branch with yet another root-id
 $ cd ..
 $ bzr init ubuntu
 Created a standalone tree (format: 2a)
 $ cd ubuntu
+# Work around merging into empty branch not being supported
+# (http://pad.lv/308562)
+$ echo something >not-empty-ubuntu
+$ bzr add
+adding not-empty-ubuntu
+$ bzr commit -m 'Add some content in experimental'
+2>Committing to: .../ubuntu/
+2>added not-empty-ubuntu
+2>Committed revision 1.
 # Also merge debian
 $ bzr merge ../debian -r0..2
 2>+N  dir/
@@ -1119,11 +1137,12 @@
 2>All changes applied successfully.
 $ bzr commit -m 'merging debian'
 2>Committing to: .../ubuntu/
-2>deleted 
-2>modified dir
-2>Committed revision 1.
+2>added dir
+2>added dir/file
+2>Committed revision 2.
 # Now try to merge experimental
 $ bzr merge ../experimental
+2>+N  not-empty
 2>Path conflict: dir / dir
 2>1 conflicts encountered.
 """)