--- a/hgext/evolve.py Tue Apr 22 17:15:05 2014 -0700
+++ b/hgext/evolve.py Tue Apr 22 17:04:40 2014 -0700
@@ -808,7 +808,6 @@
'no support for evolution merge changesets yet',
hint="Redo the merge a use `hg prune` to obsolete the old one")
destbookmarks = repo.nodebookmarks(dest.node())
- cmdutil.duplicatecopies(repo, orig.node(), dest.node())
nodesrc = orig.node()
destphase = repo[nodesrc].phase()
try:
@@ -817,6 +816,7 @@
if r[-1]: #some conflict
raise util.Abort(
'unresolved merge conflicts (see hg help resolve)')
+ cmdutil.duplicatecopies(repo, orig.node(), dest.node())
nodenew = rebase.concludenode(repo, orig.node(), dest.node(),
node.nullid)
except util.Abort, exc: