Mercurial > hg
comparison tests/test-pull.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 | d08bb64888bc |
children | 7f18bab2c0b0 |
comparison
equal
deleted
inserted
replaced
13445:61a898576888 | 13446:1e497df514e2 |
---|---|
47 pulling from http://foo:***@localhost:$HGPORT/ | 47 pulling from http://foo:***@localhost:$HGPORT/ |
48 searching for changes | 48 searching for changes |
49 no changes found | 49 no changes found |
50 | 50 |
51 $ hg rollback --dry-run --verbose | 51 $ hg rollback --dry-run --verbose |
52 rolling back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/) | 52 repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/) |
53 | 53 |
54 Issue622: hg init && hg pull -u URL doesn't checkout default branch | 54 Issue622: hg init && hg pull -u URL doesn't checkout default branch |
55 | 55 |
56 $ cd .. | 56 $ cd .. |
57 $ hg init empty | 57 $ hg init empty |