##// END OF EJS Templates
mq: checktoppatch should only check if p1 is qtip...
Mads Kiilerich -
r18343:cfa731b4 default
parent child Browse files
Show More
@@ -929,11 +929,11 b' class queue(object):'
929 self._cleanup(realpatches, numrevs, opts.get('keep'))
929 self._cleanup(realpatches, numrevs, opts.get('keep'))
930
930
931 def checktoppatch(self, repo):
931 def checktoppatch(self, repo):
932 '''check that working directory is at qtip'''
932 if self.applied:
933 if self.applied:
933 top = self.applied[-1].node
934 top = self.applied[-1].node
934 patch = self.applied[-1].name
935 patch = self.applied[-1].name
935 pp = repo.dirstate.parents()
936 if repo.dirstate.p1() != top:
936 if top not in pp:
937 raise util.Abort(_("working directory revision is not qtip"))
937 raise util.Abort(_("working directory revision is not qtip"))
938 return top, patch
938 return top, patch
939 return None, None
939 return None, None
General Comments 0
You need to be logged in to leave comments. Login now