changeset 22360:3e483253213e

convert: don't use multi-argument set.update Mumble mumble 2.4 mumble.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 31 Aug 2014 11:11:42 +0200
parents e3714b927af5
children eb6adf750954
files hgext/convert/hg.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)