880             s._dirty = False

   880             s._dirty = False

   881         self._loadfunc = _load_for_read

   881         self._loadfunc = _load_for_read

   882 

   882 

   883     def writesubtrees(self, m1, m2, writesubtree):

   883     def writesubtrees(self, m1, m2, writesubtree):

   884         self._load() # for consistency; should never have any effect here

   884         self._load() # for consistency; should never have any effect here

   885         emptytree = treemanifest()

   887         emptytree = treemanifest()

   886         for d, subm in self._dirs.iteritems():

   888         for d, subm in self._dirs.iteritems():

   887             subp1 = m1._dirs.get(d, emptytree)._node

   889             subp1 = m1._dirs.get(d, emptytree)._node

   888             subp2 = m2._dirs.get(d, emptytree)._node

   890             subp2 = m2._dirs.get(d, emptytree)._node

   889             if subp1 == revlog.nullid:

   891             if subp1 == revlog.nullid: