##// END OF EJS Templates
strip: make it clear that --force discards changes (issue310)
Patrick Mezard -
r14502:deb82fdd stable
parent child Browse files
Show More
@@ -2537,8 +2537,9 b' def strip(ui, repo, *revs, **opts):'
2537 """strip changesets and all their descendants from the repository
2537 """strip changesets and all their descendants from the repository
2538
2538
2539 The strip command removes the specified changesets and all their
2539 The strip command removes the specified changesets and all their
2540 descendants. If the working directory has uncommitted changes,
2540 descendants. If the working directory has uncommitted changes, the
2541 the operation is aborted unless the --force flag is supplied.
2541 operation is aborted unless the --force flag is supplied, in which
2542 case changes will be discarded.
2542
2543
2543 If a parent of the working directory is stripped, then the working
2544 If a parent of the working directory is stripped, then the working
2544 directory will automatically be updated to the most recent
2545 directory will automatically be updated to the most recent
@@ -3234,8 +3235,8 b' cmdtable = {'
3234 _('hg qseries [-ms]')),
3235 _('hg qseries [-ms]')),
3235 "strip":
3236 "strip":
3236 (strip,
3237 (strip,
3237 [('f', 'force', None, _('force removal of changesets even if the '
3238 [('f', 'force', None, _('force removal of changesets, discard '
3238 'working directory has uncommitted changes')),
3239 'uncommitted changes (no backup)')),
3239 ('b', 'backup', None, _('bundle only changesets with local revision'
3240 ('b', 'backup', None, _('bundle only changesets with local revision'
3240 ' number greater than REV which are not'
3241 ' number greater than REV which are not'
3241 ' descendants of REV (DEPRECATED)')),
3242 ' descendants of REV (DEPRECATED)')),
General Comments 0
You need to be logged in to leave comments. Login now