--- a/mercurial/hg.py Fri May 27 19:38:34 2005 -0800
+++ b/mercurial/hg.py Sat May 28 11:48:00 2005 -0800
@@ -357,7 +357,8 @@
new = new.keys()
new.sort()
- edittext = text + "\n"+"".join(["HG: changed %s\n" % f for f in new])
+ edittext = text + "\n" + "HG: manifest hash %s\n" % hex(mnode)
+ edittext += "".join(["HG: changed %s\n" % f for f in new])
edittext += "".join(["HG: removed %s\n" % f for f in remove])
edittext = self.ui.edit(edittext)
@@ -768,6 +769,7 @@
if co == cn: cn = -1
edittext = "\nHG: merge resolve\n" + \
+ "HG: manifest hash %s\n" % hex(mnode) + \
"".join(["HG: changed %s\n" % f for f in new])
edittext = self.ui.edit(edittext)
n = self.changelog.add(node, new, edittext, tr, co, cn)