Mercurial > hg-stable
changeset 15187:0292f88d3b86
rollback: use a hint for force
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 01 Oct 2011 16:18:51 -0500 |
| parents | 59e8bc22506e |
| children | 8e115063950d |
| files | mercurial/localrepo.py tests/test-rollback.t |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Fri Sep 30 21:58:54 2011 -0400 +++ b/mercurial/localrepo.py Sat Oct 01 16:18:51 2011 -0500 @@ -791,7 +791,7 @@ if not force and self['.'] != self['tip'] and desc == 'commit': raise util.Abort( _('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) if dryrun:
--- a/tests/test-rollback.t Fri Sep 30 21:58:54 2011 -0400 +++ b/tests/test-rollback.t Sat Oct 01 16:18:51 2011 -0500 @@ -160,7 +160,8 @@ $ hg update 0 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ 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] $ hg tip -q 2:4d9cd3795eea