Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert-repo: fix up octopus merge conversion
authorMatt Mackall <mpm@selenic.com>
Wed, 05 Oct 2005 19:27:35 -0700
changeset 1389 9b3ef6f3cef5
parent 1388 5eb2d3c54165
child 1390 ce95599eedac
child 1457 518da3c3b6ce
convert-repo: fix up octopus merge conversion
contrib/convert-repo file | annotate | diff | comparison | revisions 
--- 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:
Mercurial