diff -r 6d66200bff3b -r 8a84347b9907 mercurial/manifest.py --- a/mercurial/manifest.py Tue Aug 30 13:13:50 2016 -0400 +++ b/mercurial/manifest.py Mon Aug 29 17:48:14 2016 -0700 @@ -882,6 +882,8 @@ def writesubtrees(self, m1, m2, writesubtree): self._load() # for consistency; should never have any effect here + m1._load() + m2._load() emptytree = treemanifest() for d, subm in self._dirs.iteritems(): subp1 = m1._dirs.get(d, emptytree)._node