help = 'pop the top of the series'
-usage = '%prog [options]'
+usage = """%prog [options]
+
+Pop the topmost patch or a range of patches starting with the topmost
+one from the stack. The command fails if there are local changes or
+conflicts."""
options = [make_option('-a', '--all',
help = 'pop all the applied patches',
if options.to:
if options.to not in applied:
- raise CmdException, 'Patch "%s" not applied' % options.to
+ if options.to in crt_series.get_unapplied():
+ raise CmdException, 'Patch "%s" is not currently applied.' % options.to
+ else:
+ raise CmdException, 'Patch "%s" does not exist.' % options.to
patches = applied[:applied.index(options.to)]
elif options.number:
patches = applied[:options.number]