Mercurial > hg > mercurial-crew-with-dirclash

comparison hgext/mq.py @ 2512:e4deeaac5e74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: fix qparents to return the correct parent when no patches are applied
author Chris Mason <mason@suse.com>
date Tue, 27 Jun 2006 10:49:46 -0400
parents 041d8f0a8437
children 7a90e0c77f43
comparison
equal deleted inserted replaced
2511:041d8f0a8437 2512:e4deeaac5e74
212 p1 = revlog.hex(pp[1]) 212 p1 = revlog.hex(pp[1])
213 if p0 in arevs: 213 if p0 in arevs:
214 return pp[0] 214 return pp[0]
215 if p1 in arevs: 215 if p1 in arevs:
216 return pp[1] 216 return pp[1]
217 return None
218 return pp[0] 217 return pp[0]
219 218
220 def mergepatch(self, repo, mergeq, series, wlock): 219 def mergepatch(self, repo, mergeq, series, wlock):
221 if len(self.applied) == 0: 220 if len(self.applied) == 0:
222 # each of the patches merged in will have two parents. This 221 # each of the patches merged in will have two parents. This