Mercurial > hg
changeset 6619:170818dad56b
merge from crew-stable
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Mon, 19 May 2008 10:23:47 +0200 |
| parents | 876fdc73cde0 (current diff) f4c612da788d (diff) |
| children | 92ee960a928d |
| files | hgext/mq.py |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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":