Skip to content
Snippets Groups Projects
Commit 0292f88d authored by Matt Mackall's avatar Matt Mackall
Browse files

rollback: use a hint for force

parent 59e8bc22
No related branches found
No related tags found
No related merge requests found
...@@ -791,7 +791,7 @@ ...@@ -791,7 +791,7 @@
if not force and self['.'] != self['tip'] and desc == 'commit': if not force and self['.'] != self['tip'] and desc == 'commit':
raise util.Abort( raise util.Abort(
_('rollback of last commit while not checked out ' _('rollback of last commit while not checked out '
'may lose data (use -f to force)')) 'may lose data'), hint=_('use -f to force'))
ui.status(msg) ui.status(msg)
if dryrun: if dryrun:
......
...@@ -160,7 +160,8 @@ ...@@ -160,7 +160,8 @@
$ hg update 0 $ hg update 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg rollback $ hg rollback
abort: rollback of last commit while not checked out may lose data (use -f to force) abort: rollback of last commit while not checked out may lose data
(use -f to force)
[255] [255]
$ hg tip -q $ hg tip -q
2:4d9cd3795eea 2:4d9cd3795eea
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment