Mercurial > hg > mercurial-crew-with-dirclash
comparison contrib/convert-repo @ 1389:9b3ef6f3cef5
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 |
comparison
equal
deleted
inserted
replaced
1388:5eb2d3c54165 | 1389:9b3ef6f3cef5 |
---|---|
130 p1 = p2 | 130 p1 = p2 |
131 p2 = parents.pop(0) | 131 p2 = parents.pop(0) |
132 self.repo.rawcommit(files, text, author, dest, | 132 self.repo.rawcommit(files, text, author, dest, |
133 hg.bin(p1), hg.bin(p2)) | 133 hg.bin(p1), hg.bin(p2)) |
134 text = "(octopus merge fixup)\n" | 134 text = "(octopus merge fixup)\n" |
135 | 135 p2 = hg.hex(self.repo.changelog.tip()) |
136 return hg.hex(self.repo.changelog.tip()) | 136 |
137 return p2 | |
137 | 138 |
138 def puttags(self, tags): | 139 def puttags(self, tags): |
139 try: | 140 try: |
140 old = self.repo.wfile(".hgtags").read() | 141 old = self.repo.wfile(".hgtags").read() |
141 oldlines = old.splitlines(1) | 142 oldlines = old.splitlines(1) |