# HG changeset patch # User Martin von Zweigbergk # Date 2016-10-17 23:12:12 # Node ID abe7230025099bbeb9eaa0d3ca29c8f700ddb1e2 # Parent d105195436c0f89263f26cee8939a914feedf060 treemanifest: fix bad argument order to treemanifestctx Found by running tests with _treeinmem (both of them) modified to be True. diff --git a/mercurial/manifest.py b/mercurial/manifest.py --- a/mercurial/manifest.py +++ b/mercurial/manifest.py @@ -1386,7 +1386,7 @@ class treemanifestctx(object): # Need to perform a slow delta revlog = self._revlog r0 = revlog.deltaparent(revlog.rev(self._node)) - m0 = treemanifestctx(revlog, revlog.node(r0), dir=self._dir).read() + m0 = treemanifestctx(revlog, self._dir, revlog.node(r0)).read() m1 = self.read() md = treemanifest(dir=self._dir) for f, ((n0, fl0), (n1, fl1)) in m0.diff(m1).iteritems():