Show More
@@ -533,7 +533,8 b' class queue:' | |||
|
533 | 533 | |
|
534 | 534 | def delete(self, repo, patches, opts): |
|
535 | 535 | if not patches and not opts.get('rev'): |
|
536 |
raise util.Abort(_(' |
|
|
536 | raise util.Abort(_('qdelete requires at least one revision or ' | |
|
537 | 'patch name')) | |
|
537 | 538 | |
|
538 | 539 | realpatches = [] |
|
539 | 540 | for patch in patches: |
@@ -1383,11 +1384,13 b' class queue:' | |||
|
1383 | 1384 | def delete(ui, repo, *patches, **opts): |
|
1384 | 1385 | """remove patches from queue |
|
1385 | 1386 | |
|
1386 | With --rev, mq will stop managing the named revisions. The | |
|
1387 | patches must be applied and at the base of the stack. This option | |
|
1388 | is useful when the patches have been applied upstream. | |
|
1387 | The patches must not be applied, unless they are arguments to | |
|
1388 | the --rev parameter. At least one patch or revision is required. | |
|
1389 | 1389 | |
|
1390 | Otherwise, the patches must not be applied. | |
|
1390 | With --rev, mq will stop managing the named revisions (converting | |
|
1391 | them to regular mercurial changesets). The patches must be applied | |
|
1392 | and at the base of the stack. This option is useful when the patches | |
|
1393 | have been applied upstream. | |
|
1391 | 1394 | |
|
1392 | 1395 | With --keep, the patch files are preserved in the patch directory.""" |
|
1393 | 1396 | q = repo.mq |
@@ -2109,7 +2112,7 b' cmdtable = {' | |||
|
2109 | 2112 | (delete, |
|
2110 | 2113 | [('k', 'keep', None, _('keep patch file')), |
|
2111 | 2114 | ('r', 'rev', [], _('stop managing a revision'))], |
|
2112 | _('hg qdelete [-k] [-r REV]... PATCH...')), | |
|
2115 | _('hg qdelete [-k] [-r REV]... [PATCH]...')), | |
|
2113 | 2116 | 'qfold': |
|
2114 | 2117 | (fold, |
|
2115 | 2118 | [('e', 'edit', None, _('edit patch header')), |
General Comments 0
You need to be logged in to leave comments.
Login now