Mercurial > hg > pyhgsh

changeset 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 ce95599eedac 518da3c3b6ce
files contrib/convert-repo
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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: