--- a/mercurial/commands.py Fri Jun 29 00:01:19 2012 +0200
+++ b/mercurial/commands.py Fri Jun 29 00:40:52 2012 -0500
@@ -2752,11 +2752,6 @@
ctx.p1().node())
finally:
repo.ui.setconfig('ui', 'forcemerge', '')
- # drop the second merge parent
- repo.setparents(current.node(), nullid)
- repo.dirstate.write()
- # fix up dirstate for copies and renames
- cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
# report any conflicts
if stats and stats[3] > 0:
# write out state for --continue
@@ -2768,6 +2763,12 @@
else:
cont = False
+ # drop the second merge parent
+ repo.setparents(current.node(), nullid)
+ repo.dirstate.write()
+ # fix up dirstate for copies and renames
+ cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
+
# commit
source = ctx.extra().get('source')
if not source: