diff --git a/hgext/strip.py b/hgext/strip.py --- a/hgext/strip.py +++ b/hgext/strip.py @@ -78,9 +78,6 @@ def strip(ui, repo, revs, update=True, b 'option)'), _('REV')), ('f', 'force', None, _('force removal of changesets, discard ' 'uncommitted changes (no backup)')), - ('b', 'backup', None, _('bundle only changesets with local revision' - ' number greater than REV which are not' - ' descendants of REV (DEPRECATED)')), ('', 'no-backup', None, _('no backups')), ('', 'nobackup', None, _('no backups (DEPRECATED)')), ('n', '', None, _('ignored (DEPRECATED)')), diff --git a/tests/test-strip.t b/tests/test-strip.t --- a/tests/test-strip.t +++ b/tests/test-strip.t @@ -524,4 +524,28 @@ test hg strip -B bookmark $ hg bookmarks * B 6:ff43616e5d0f - $ cd .. +Make sure no one adds back a -b option: + + $ hg strip -b tip + hg strip: option -b not recognized + hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV... + + strip changesets and all their descendants from the repository + + use "hg help -e strip" to show help for the strip extension + + options: + + -r --rev REV [+] strip specified revision (optional, can specify revisions + without this option) + -f --force force removal of changesets, discard uncommitted changes + (no backup) + --no-backup no backups + -k --keep do not modify working copy during strip + -B --bookmark VALUE remove revs only reachable from given bookmark + --mq operate on patch repository + + [+] marked option can be specified multiple times + + use "hg help strip" to show the full help text + [255]