equal
deleted
inserted
replaced
355 |
355 |
356 # add changeset |
356 # add changeset |
357 new = new.keys() |
357 new = new.keys() |
358 new.sort() |
358 new.sort() |
359 |
359 |
360 edittext = text + "\n"+"".join(["HG: changed %s\n" % f for f in new]) |
360 edittext = text + "\n" + "HG: manifest hash %s\n" % hex(mnode) |
|
361 edittext += "".join(["HG: changed %s\n" % f for f in new]) |
361 edittext += "".join(["HG: removed %s\n" % f for f in remove]) |
362 edittext += "".join(["HG: removed %s\n" % f for f in remove]) |
362 edittext = self.ui.edit(edittext) |
363 edittext = self.ui.edit(edittext) |
363 |
364 |
364 n = self.changelog.add(mnode, new, edittext, tr) |
365 n = self.changelog.add(mnode, new, edittext, tr) |
365 tr.close() |
366 tr.close() |
766 # and manifest id to the changelog |
767 # and manifest id to the changelog |
767 self.ui.status("committing merge changeset\n") |
768 self.ui.status("committing merge changeset\n") |
768 if co == cn: cn = -1 |
769 if co == cn: cn = -1 |
769 |
770 |
770 edittext = "\nHG: merge resolve\n" + \ |
771 edittext = "\nHG: merge resolve\n" + \ |
|
772 "HG: manifest hash %s\n" % hex(mnode) + \ |
771 "".join(["HG: changed %s\n" % f for f in new]) |
773 "".join(["HG: changed %s\n" % f for f in new]) |
772 edittext = self.ui.edit(edittext) |
774 edittext = self.ui.edit(edittext) |
773 n = self.changelog.add(node, new, edittext, tr, co, cn) |
775 n = self.changelog.add(node, new, edittext, tr, co, cn) |
774 |
776 |
775 tr.close() |
777 tr.close() |