Rev 4639: One case was forgotten about possibly deleted detritus files. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4639
revision-id: v.ladeuil+lp at free.fr-20101116093200-ya8323vnfngy8z32
parent: v.ladeuil+lp at free.fr-20101115170435-qqqz52e6zsf0be63
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: next
timestamp: Tue 2010-11-16 10:32:00 +0100
message:
  One case was forgotten about possibly deleted detritus files.
-------------- next part --------------
=== modified file 'bzrlib/conflicts.py'
--- a/bzrlib/conflicts.py	2010-11-12 09:34:21 +0000
+++ b/bzrlib/conflicts.py	2010-11-16 09:32:00 +0000
@@ -819,6 +819,8 @@
     format = 'Conflict adding files to %(path)s.  %(action)s.'
 
     def action_take_this(self, tree):
+        # FIXME: This may remove detritus files which may need to be
+        # quarantined somewhere.
         tree.remove([self.path], force=True, keep_files=False)
 
     def action_take_other(self, tree):