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
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):