##// END OF EJS Templates
dirstate: make sure we read the dirstate before setting parents
Matt Mackall -
r1394:b20b683e default
parent child Browse files
Show More
@@ -117,6 +117,8 b' class dirstate:'
117 self.dirty = 1
117 self.dirty = 1
118
118
119 def setparents(self, p1, p2=nullid):
119 def setparents(self, p1, p2=nullid):
120 if not self.pl:
121 self.read()
120 self.markdirty()
122 self.markdirty()
121 self.pl = p1, p2
123 self.pl = p1, p2
122
124
General Comments 0
You need to be logged in to leave comments. Login now