facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

convert-repo: fix up octopus merge conversion

Browse Source
This commit is contained in:
Matt Mackall 2005-10-05 19:27:35 -07:00
parent fcbb29caf2
commit 6cfc6d18b1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/convert-repo
View File

@ -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: