merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes
issue1533.
#!/usr/bin/env python
import sys, os
from mercurial import revlog, transaction, node, util
f = sys.argv[1]
r1 = revlog.revlog(util.opener(os.getcwd(), audit=False), f + ".i", f + ".d")
r2 = revlog.revlog(util.opener(os.getcwd(), audit=False), f + ".i2", f + ".d2")
tr = transaction.transaction(sys.stderr.write, open, "journal")
for i in xrange(r1.count()):
n = r1.node(i)
p1, p2 = r1.parents(n)
l = r1.linkrev(n)
t = r1.revision(n)
n2 = r2.addrevision(t, tr, l, p1, p2)
tr.close()
os.rename(f + ".i", f + ".i.old")
os.rename(f + ".d", f + ".d.old")
os.rename(f + ".i2", f + ".i")
os.rename(f + ".d2", f + ".d")