Mercurial > hg > mercurial-crew-with-dirclash

diff contrib/convert-repo @ 1389:9b3ef6f3cef5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert-repo: fix up octopus merge conversion
author Matt Mackall <mpm@selenic.com>
date Wed, 05 Oct 2005 19:27:35 -0700
parents 5eb2d3c54165
children 7bfd4724932a
line wrap: on
line diff
--- a/contrib/convert-repo
+++ b/contrib/convert-repo
@@ -132,8 +132,9 @@ class convert_mercurial:
             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: