# HG changeset patch # User Matt Mackall # Date 2012-03-22 22:07:39 # Node ID 900eee0778d164292dd0045401e14243464cdf29 # Parent 1c2aaf05f7d7bc02648031ff7c4c55d56ba89914 strip: ignore -n (issue3326) (BC) -n could be confused for --dry-run by foolhardy users, resulting in permanent data loss. As leaving a backup when none was requested is significantly less disastrous, the short option is silently ignored. Old scripts continue to work, users only get lightly burned. diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -2762,8 +2762,9 @@ def save(ui, repo, **opts): ('b', 'backup', None, _('bundle only changesets with local revision' ' number greater than REV which are not' ' descendants of REV (DEPRECATED)')), - ('n', 'no-backup', None, _('no backups')), + ('', 'no-backup', None, _('no backups')), ('', 'nobackup', None, _('no backups (DEPRECATED)')), + ('n', '', None, _('ignored (DEPRECATED)')), ('k', 'keep', None, _("do not modify working copy during strip"))], _('hg strip [-k] [-f] [-n] REV...')) def strip(ui, repo, *revs, **opts):