Rev 4629: Implement --interactive for MissingParent. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4629
revision-id: v.ladeuil+lp at free.fr-20091019150227-nyq6wfn3ac9o9b14
parent: v.ladeuil+lp at free.fr-20091019141812-lwxo72eft2nfpzxe
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Mon 2009-10-19 17:02:27 +0200
message:
  Implement --interactive for MissingParent.
  
  * bzrlib/tests/test_conflicts.py:
  (TestResolveMissingParent): Tests for --interactive.
  
  * bzrlib/conflicts.py:
  (MissingParent): Add actions for --interactive.
-------------- next part --------------
=== modified file 'bzrlib/conflicts.py'
--- a/bzrlib/conflicts.py	2009-10-19 14:18:12 +0000
+++ b/bzrlib/conflicts.py	2009-10-19 15:02:27 +0000
@@ -555,6 +555,13 @@
 
     format = 'Conflict adding files to %(path)s.  %(action)s.'
 
+    def keep_mine(self, tree):
+        tree.remove([self.path], force=True, keep_files=False)
+
+    def take_theirs(self, tree):
+        # just acccept bzr proposal
+        pass
+
 
 class DeletingParent(HandledConflict):
     """An attempt to add files to a directory that is not present.

=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2009-10-19 14:18:12 +0000
+++ b/bzrlib/tests/test_conflicts.py	2009-10-19 15:02:27 +0000
@@ -174,6 +174,7 @@
         self.assertEqual(conflicts.ConflictList([]), tree.conflicts())
 
 
+# FIXME: Tests missing for DuplicateID conflict type
 class TestResolveConflicts(script.TestCaseWithTransportAndScript):
 
     preamble = None # The setup script set by daughter classes
@@ -245,7 +246,7 @@
 """)
 
 
-class TestResolveDuplicatePaths(TestResolveConflicts):
+class TestResolveDuplicateEntry(TestResolveConflicts):
 
     preamble = """
 $ bzr init trunk
@@ -393,6 +394,20 @@
 $ bzr commit --strict -m 'No more conflicts nor unknown files'
 """)
 
+    def test_resolve_keeping_mine(self):
+        self.run_script("""
+$ bzr resolve --interactive dir
+<keep_mine
+$ bzr commit --strict -m 'No more conflicts nor unknown files'
+""")
+
+    def test_resolve_taking_theirs(self):
+        self.run_script("""
+$ bzr resolve --interactive dir
+<take_theirs
+$ bzr commit --strict -m 'No more conflicts nor unknown files'
+""")
+
 
 class TestResolveDeletingParent(TestResolveConflicts):