Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/manifest.py
changeset 24527 8aead3bc5ff8
parent 24526 cd50f3717639
child 24528 b538ae24aa97 
--- a/mercurial/manifest.py	Fri Mar 27 16:19:44 2015 -0700
+++ b/mercurial/manifest.py	Fri Mar 27 17:07:24 2015 -0700
@@ -647,7 +647,8 @@
             return None, None
 
     def add(self, m, transaction, link, p1, p2, added, removed):
-        if p1 in self._mancache and not self._usetreemanifest:
+        if (p1 in self._mancache and not self._usetreemanifest
+            and not self._usemanifestv2):
             # If our first parent is in the manifest cache, we can
             # compute a delta here using properties we know about the
             # manifest up-front, which may save time later for the
mercurial