Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/dirstate.py @ 1394:b20b683e8d95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: make sure we read the dirstate before setting parents
author Matt Mackall <mpm@selenic.com>
date Tue, 18 Oct 2005 00:43:19 -0700
parents 32d8068b3e36
children 8c3e2a254257
comparison
equal deleted inserted replaced
1393:67779d34cb52 1394:b20b683e8d95
115 def markdirty(self): 115 def markdirty(self):
116 if not self.dirty: 116 if not self.dirty:
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
123 def state(self, key): 125 def state(self, key):
124 try: 126 try: