Patchwork [12,of,16] merge: temporarily verify that we only have one action for each filename

login
register
mail settings
Submitter Mads Kiilerich
Date March 2, 2014, 7:15 p.m.
Message ID <9676d2ab8613a58f1b9e.1393787745@localhost.localdomain>
Download mbox | patch
Permalink /patch/3824/
State Deferred
Headers show

Comments

Mads Kiilerich - March 2, 2014, 7:15 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1393782896 -3600
#      Sun Mar 02 18:54:56 2014 +0100
# Node ID 9676d2ab8613a58f1b9e29d04c9b47ce3d3700e4
# Parent  ee728599ef740d08cc0b8f102d3dc6325f48120b
merge: temporarily verify that we only have one action for each filename

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -499,6 +499,10 @@  def manifestmerge(repo, wctx, p2, pa, br
         else:
             _checkcollision(repo, m1, actions)
 
+    # temporarily verify that we only have one action for each filename
+    fns = [a[0] for a in actions]
+    assert len(fns) == len(set(fns)), actions
+
     return actions
 
 def actionkey(a):