Rev 5990: Make it clear that we start from an empty cooked_conflicts list. in file:///home/vila/src/bzr/bugs/688101-duplicate-ids/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/688101-duplicate-ids/

------------------------------------------------------------
revno: 5990
revision-id: v.ladeuil+lp at free.fr-20110621220233-fqpsdymzsoqhy064
parent: v.ladeuil+lp at free.fr-20110621151918-qsr5g8sr66asb58a
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 688101-duplicate-ids
timestamp: Wed 2011-06-22 00:02:33 +0200
message:
  Make it clear that we start from an empty cooked_conflicts list.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2011-06-21 15:19:18 +0000
+++ b/bzrlib/merge.py	2011-06-21 22:02:33 +0000
@@ -1663,6 +1663,8 @@
             else:
                 raise AssertionError('bad conflict type: %r' % (conflict,))
             cooked_conflicts.append(c)
+
+        self.cooked_conflicts = []
         # We want to get rid of path conflicts when a corresponding contents
         # conflict exists. This can occur when one branch deletes a file while
         # the other renames *and* modifies it. In this case, the content