# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1128565655 25200
# Node ID 9b3ef6f3cef5c19c0ddf894ec63ad2dbc51a0d63
# Parent  5eb2d3c541659dd9920e1d2f10c44844736ae344
convert-repo: fix up octopus merge conversion



diff -r 5eb2d3c54165 -r 9b3ef6f3cef5 contrib/convert-repo
--- a/contrib/convert-repo	Wed Oct 05 19:26:41 2005 -0700
+++ b/contrib/convert-repo	Wed Oct 05 19:27:35 2005 -0700
@@ -132,8 +132,9 @@
             self.repo.rawcommit(files, text, author, dest,
                                 hg.bin(p1), hg.bin(p2))
             text = "(octopus merge fixup)\n"
+            p2 = hg.hex(self.repo.changelog.tip())
 
-        return hg.hex(self.repo.changelog.tip())
+        return p2
 
     def puttags(self, tags):
         try: