mercurial/localrepo.py
changeset 29962 6b5a9a01f29d
parent 29920 e35a83cedde1
child 29975 c15f06109b7a
--- a/mercurial/localrepo.py	Tue Sep 20 12:24:01 2016 -0700
+++ b/mercurial/localrepo.py	Tue Sep 20 12:24:01 2016 -0700
@@ -1732,9 +1732,9 @@
                 drop = [f for f in removed if f in m]
                 for f in drop:
                     del m[f]
-                mn = self.manifest.add(m, trp, linkrev,
-                                       p1.manifestnode(), p2.manifestnode(),
-                                       added, drop)
+                mn = self.manifestlog.add(m, trp, linkrev,
+                                          p1.manifestnode(), p2.manifestnode(),
+                                          added, drop)
                 files = changed + removed
             else:
                 mn = p1.manifestnode()