##// END OF EJS Templates
manifest: call m1.load and m2.load before writing a subtree...
Durham Goode -
r29888:8a84347b default
parent child Browse files
Show More
@@ -882,6 +882,8 b' class treemanifest(object):'
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 m1._load()
886 m2._load()
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
General Comments 0
You need to be logged in to leave comments. Login now