# HG changeset patch # User Mads Kiilerich # Date 2014-08-31 09:11:42 # Node ID 3e483253213ee9c1c27077807ae0e8d6a3bfe3fe # Parent e3714b927af5510d9103fa8944f6f2aa13aeaf15 convert: don't use multi-argument set.update Mumble mumble 2.4 mumble. diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py --- a/hgext/convert/hg.py +++ b/hgext/convert/hg.py @@ -197,7 +197,8 @@ class mercurial_sink(converter_sink): 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)