changeset 22360 | 3e483253213e |
parent 22300 | 35ab037de989 |
child 22698 | 32a8ad782260 |
--- a/hgext/convert/hg.py Sat Aug 30 12:22:20 2014 +0200 +++ b/hgext/convert/hg.py Sun Aug 31 11:11:42 2014 +0200 @@ -197,7 +197,8 @@ p2 = parents.pop(0) fileset = set(files) if full: - fileset.update(self.repo[p1], self.repo[p2]) + fileset.update(self.repo[p1]) + fileset.update(self.repo[p2]) ctx = context.memctx(self.repo, (p1, p2), text, fileset, getfilectx, commit.author, commit.date, extra) self.repo.commitctx(ctx)