changeset 7874 | d812029cda85 |
parent 7815 | bcd364b247ba |
child 7875 | 553aa0cbeab6 |
--- a/hgext/convert/hg.py Mon Mar 23 13:12:07 2009 +0100 +++ b/hgext/convert/hg.py Mon Mar 23 13:13:02 2009 +0100 @@ -142,7 +142,7 @@ p2 = parents.pop(0) ctx = context.memctx(self.repo, (p1, p2), text, files.keys(), getfilectx, commit.author, commit.date, extra) - a = self.repo.commitctx(ctx) + self.repo.commitctx(ctx) text = "(octopus merge fixup)\n" p2 = hex(self.repo.changelog.tip())