mercurial/localrepo.py

--- a/mercurial/localrepo.py	Thu Sep 25 14:13:31 2014 -0400
+++ b/mercurial/localrepo.py	Wed Oct 08 11:52:30 2014 -0400
@@ -1415,7 +1415,7 @@
                 for f in drop:
                     del m1[f]
                 mn = self.manifest.add(m1, trp, linkrev, p1.manifestnode(),
-                                       p2.manifestnode(), (new, drop))
+                                       p2.manifestnode(), new, drop)
                 files = changed + removed
             else:
                 mn = p1.manifestnode()