Rev 5111: First attempt at reproducing the bug in file:///home/vila/src/bzr/bugs/660935-invalid-entry-name/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/660935-invalid-entry-name/

------------------------------------------------------------
revno: 5111
revision-id: v.ladeuil+lp at free.fr-20110114184048-jzgcp4rd7bosgiw7
parent: pqm at pqm.ubuntu.com-20101111095854-ly7aclc4c0bnv2h2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 660935-invalid-entry-name
timestamp: Fri 2011-01-14 19:40:48 +0100
message:
  First attempt at reproducing the bug
-------------- next part --------------
=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2010-04-06 10:12:42 +0000
+++ b/bzrlib/tests/test_conflicts.py	2011-01-14 18:40:48 +0000
@@ -960,6 +960,44 @@
 2>bzr: ERROR: Tree transform is malformed [('unversioned executability', 'new-1')]
 """)
 
+    def test_bug_660935(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 featureA
+2>Branched 1 revision(s).
+$ cd featureA
+$ echo featureA > file
+$ bzr commit -m 'modify file for featureA'
+2>Committing to: .../featureA/
+2>modified file
+2>Committed revision 2.
+$ cd ..
+$ cd trunk
+$ bzr rm file
+2>deleted file
+$ bzr commit -m 'Delete file'
+2>Committing to: .../trunk/
+2>deleted file
+2>Committed revision 2.
+$ cd ../featureA
+$ bzr merge ../trunk
+2>RM  file => file.THIS
+2>Contents conflict in file
+2>1 conflicts encountered.
+$ bzr conflicts
+Contents conflict in file
+$ bzr resolve --take-other
+""")
 
 class TestResolveActionOption(tests.TestCase):