Mercurial > public > mercurial-scm > hg
diff tests/test-notify.t @ 13446:1e497df514e2 stable
rollback: clarifies the message about the reverted state (issue2628)
Previously, when rolling back a transaction, some users could be confused
between the level to which the store is rolled back, and the new parents
of the working directory.
$ hg rollback
rolling back to revision 4 (undo commit)
With this change:
$ hg rollback
repository tip rolled back to tip revision 4 (undo commit)
working directory now based on revision 2 and 1
So now the user can realize that the store has been rolled back to an older
tip, but also that the working directory may not on the tip (here we are
rolling back the merge of the heads 2 and 1)
| author | Gilles Moris <gilles.moris@free.fr> |
|---|---|
| date | Thu, 10 Feb 2011 09:03:06 +0100 |
| parents | e3bf16703e26 |
| children | 301725c3df9a |
line wrap: on
line diff
--- a/tests/test-notify.t Mon Feb 21 00:57:19 2011 +0100 +++ b/tests/test-notify.t Thu Feb 10 09:03:06 2011 +0100 @@ -152,7 +152,8 @@ fail for config file is missing $ hg --cwd b rollback - rolling back to revision 0 (undo pull) + repository tip rolled back to revision 0 (undo pull) + working directory now based on revision 0 $ hg --cwd b pull ../a 2>&1 | grep 'error.*\.notify\.conf' > /dev/null && echo pull failed pull failed $ touch ".notify.conf" @@ -160,7 +161,8 @@ pull $ hg --cwd b rollback - rolling back to revision 0 (undo pull) + repository tip rolled back to revision 0 (undo pull) + working directory now based on revision 0 $ hg --traceback --cwd b pull ../a | \ > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' pulling from ../a @@ -204,7 +206,8 @@ pull $ hg --cwd b rollback - rolling back to revision 0 (undo pull) + repository tip rolled back to revision 0 (undo pull) + working directory now based on revision 0 $ hg --traceback --cwd b pull ../a | \ > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' pulling from ../a