Mercurial > hg

changeset 16278:900eee0778d1 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Matt Mackall <mpm@selenic.com>
date Thu, 22 Mar 2012 17:07:39 -0500
parents 1c2aaf05f7d7
children 531e69ff348f 0806823370d8 3c147aca78dd
files hgext/mq.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/mq.py	Thu Mar 22 17:07:39 2012 -0500
+++ b/hgext/mq.py	Thu Mar 22 17:07:39 2012 -0500
@@ -2762,8 +2762,9 @@
           ('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):