[Pkg-bazaar-commits] ./bzr/unstable r945: - add stubbed-out test for clashing replace and delete

[Martin Pool]

------------------------------------------------------------
revno: 945
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-07-18 11:28:13 -0300
message:
  - add stubbed-out test for clashing replace and delete
modified:
  tools/testweave.py
-------------- next part --------------
=== modified file 'tools/testweave.py'
--- a/tools/testweave.py	2005-07-18 13:38:13 +0000
+++ b/tools/testweave.py	2005-07-18 14:28:13 +0000
@@ -732,6 +732,23 @@
                      ['aaa'],
                      ['yyy', 'zzz'],
                      ['yyy', 'zzz'])
+
+
+    def testDeleteAndModify(self):
+        """Clashing delete and modification.
+
+        If one side modifies a region and the other deletes it then
+        there should be a conflict with one side blank.
+        """
+
+        #######################################
+        # skippd, not working yet
+        return
+        
+        self.doMerge(['aaa', 'bbb', 'ccc'],
+                     ['aaa', 'ddd', 'ccc'],
+                     ['aaa', 'ccc'],
+                     ['<<<<', 'aaa', '====', '>>>>', 'ccc'])
     
 
 
@@ -739,7 +756,7 @@
     import testsweet
     from unittest import TestSuite, TestLoader
     import testweave
- 
+
     tl = TestLoader()
     suite = TestSuite()
     suite.addTest(tl.loadTestsFromModule(testweave))