Rev 4628: Light changes learned while starting to understand multiple conflicts on in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4628
revision-id: v.ladeuil+lp at free.fr-20091019141812-lwxo72eft2nfpzxe
parent: v.ladeuil+lp at free.fr-20091019103023-fe6q588hn8suf8io
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Mon 2009-10-19 16:18:12 +0200
message:
  Light changes learned while starting to understand multiple conflicts on
  the same path.
  
  * bzrlib/tests/test_conflicts.py:
  (TestResolveUnversionedParent): These tests creates multiple
  conflicts...
  
  * bzrlib/help_topics/en/conflicts.txt: 
  Let's call a dir a dir not a file in 'Missing parent' doc.
  
  * bzrlib/conflicts.py:
  (_resolve_interactive): Clearer error message.
-------------- next part --------------
=== modified file 'bzrlib/conflicts.py'
--- a/bzrlib/conflicts.py	2009-10-19 10:30:23 +0000
+++ b/bzrlib/conflicts.py	2009-10-19 14:18:12 +0000
@@ -178,7 +178,7 @@
             return
         action = getattr(c, action_name, None)
         if action is None:
-            raise NotImplementedError(action_name)
+            raise NotImplementedError(c.__class__.__name__ + '.' + action_name)
         action(tree)
         # FIXME: We need an API to use that on a single conflict
         ConflictList([c]).remove_files(tree)
@@ -430,6 +430,7 @@
     def take_theirs(self, tree):
         tree.remove([self.path], force=True, keep_files=False)
 
+
 # FIXME: TextConflict is about a single file-id, there never is a conflict_path
 # attribute so we shouldn't inherit from PathConflict but simply from Conflict
 class TextConflict(PathConflict):

=== modified file 'bzrlib/help_topics/en/conflicts.txt'
--- a/bzrlib/help_topics/en/conflicts.txt	2009-08-13 06:19:32 +0000
+++ b/bzrlib/help_topics/en/conflicts.txt	2009-10-19 14:18:12 +0000
@@ -114,13 +114,13 @@
 
   Conflict adding files to FILE.  Created directory.
 
-This happens when a file has been deleted in the target, but has new children
-in the source.  This is similar to the "unversioned parent" conflict, except
-that the parent directory does not *exist*, instead of just being unversioned.
-In this situation, Bazaar will create the missing parent.  Resolving this issue
-depends very much on the particular scenario.  You may wish to rename or delete
-either the file or the directory.  When you are satisfied, you can run "bzr
-resolve FILE" to mark the conflict as resolved.
+This happens when a directory has been deleted in the target, but has new
+children in the source.  This is similar to the "unversioned parent" conflict,
+except that the parent directory does not *exist*, instead of just being
+unversioned.  In this situation, Bazaar will create the missing parent.
+Resolving this issue depends very much on the particular scenario.  You may
+wish to rename or delete either the file or the directory.  When you are
+satisfied, you can run "bzr resolve FILE" to mark the conflict as resolved.
 
 Deleting parent
 ---------------

=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2009-10-19 10:30:23 +0000
+++ b/bzrlib/tests/test_conflicts.py	2009-10-19 14:18:12 +0000
@@ -306,6 +306,8 @@
 
     # FIXME: Add the reverse tests: dir deleted in trunk, file added in branch
 
+    # FIXME: While this *creates* UnversionedParent conflicts, this really only
+    # tests MissingParent resolution :-/
     preamble = """
 $ bzr init trunk
 $ cd trunk