merge from crew-stable
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Mon, 19 May 2008 10:23:47 +0200
changeset 6619 170818dad56b
parent 6618 876fdc73cde0 (current diff)
parent 6611 f4c612da788d (diff)
child 6622 92ee960a928d
merge from crew-stable
hgext/mq.py
--- a/hgext/mq.py	Mon May 19 10:02:28 2008 +0200
+++ b/hgext/mq.py	Mon May 19 10:23:47 2008 +0200
@@ -1941,7 +1941,11 @@
     return ret
 
 def pop(ui, repo, patch=None, **opts):
-    """pop the current patch off the stack"""
+    """pop the current patch off the stack
+    
+    By default, pops off the top of the patch stack. If given a patch name,
+    keeps popping off patches until the named patch is at the top of the stack.
+    """
     localupdate = True
     if opts['name']:
         q = queue(ui, repo.join(""), repo.join(opts['name']))
@@ -2321,7 +2325,7 @@
     "^qpop":
         (pop,
          [('a', 'all', None, _('pop all patches')),
-          ('n', 'name', '', _('pop patches until the named patch is the current patch')),
+          ('n', 'name', '', _('queue name to pop')),
           ('f', 'force', None, _('forget any local changes'))],
          _('hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]')),
     "^qpush":