##// END OF EJS Templates
strip: make it clear that --force discards changes (issue310)
Patrick Mezard -
r14026:4f19242d default
parent child Browse files
Show More
@@ -2555,8 +2555,9 b' def strip(ui, repo, *revs, **opts):'
2555 """strip changesets and all their descendants from the repository
2555 """strip changesets and all their descendants from the repository
2556
2556
2557 The strip command removes the specified changesets and all their
2557 The strip command removes the specified changesets and all their
2558 descendants. If the working directory has uncommitted changes,
2558 descendants. If the working directory has uncommitted changes, the
2559 the operation is aborted unless the --force flag is supplied.
2559 operation is aborted unless the --force flag is supplied, in which
2560 case changes will be discarded.
2560
2561
2561 If a parent of the working directory is stripped, then the working
2562 If a parent of the working directory is stripped, then the working
2562 directory will automatically be updated to the most recent
2563 directory will automatically be updated to the most recent
@@ -3252,8 +3253,8 b' cmdtable = {'
3252 _('hg qseries [-ms]')),
3253 _('hg qseries [-ms]')),
3253 "strip":
3254 "strip":
3254 (strip,
3255 (strip,
3255 [('f', 'force', None, _('force removal of changesets even if the '
3256 [('f', 'force', None, _('force removal of changesets, discard '
3256 'working directory has uncommitted changes')),
3257 'uncommitted changes (no backup)')),
3257 ('b', 'backup', None, _('bundle only changesets with local revision'
3258 ('b', 'backup', None, _('bundle only changesets with local revision'
3258 ' number greater than REV which are not'
3259 ' number greater than REV which are not'
3259 ' descendants of REV (DEPRECATED)')),
3260 ' descendants of REV (DEPRECATED)')),
General Comments 0
You need to be logged in to leave comments. Login now