Mercurial > hg
comparison tests/test-bundle.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 | d724a69309e0 |
| children | c196352d935b |
comparison
equal
deleted
inserted
replaced
| 13445:61a898576888 | 13446:1e497df514e2 |
|---|---|
| 87 (run 'hg heads' to see heads, 'hg merge' to merge) | 87 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 88 | 88 |
| 89 Rollback empty | 89 Rollback empty |
| 90 | 90 |
| 91 $ hg -R empty rollback | 91 $ hg -R empty rollback |
| 92 rolling back to revision -1 (undo pull) | 92 repository tip rolled back to revision -1 (undo pull) |
| 93 working directory now based on revision -1 | |
| 93 | 94 |
| 94 Pull full.hg into empty again (using --cwd) | 95 Pull full.hg into empty again (using --cwd) |
| 95 | 96 |
| 96 $ hg --cwd empty pull ../full.hg | 97 $ hg --cwd empty pull ../full.hg |
| 97 pulling from ../full.hg | 98 pulling from ../full.hg |
| 117 no changes found | 118 no changes found |
| 118 | 119 |
| 119 Rollback empty | 120 Rollback empty |
| 120 | 121 |
| 121 $ hg -R empty rollback | 122 $ hg -R empty rollback |
| 122 rolling back to revision -1 (undo pull) | 123 repository tip rolled back to revision -1 (undo pull) |
| 124 working directory now based on revision -1 | |
| 123 | 125 |
| 124 Pull full.hg into empty again (using -R) | 126 Pull full.hg into empty again (using -R) |
| 125 | 127 |
| 126 $ hg -R empty pull full.hg | 128 $ hg -R empty pull full.hg |
| 127 pulling from full.hg | 129 pulling from full.hg |
| 214 (run 'hg heads' to see heads, 'hg merge' to merge) | 216 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 215 | 217 |
| 216 Rollback empty | 218 Rollback empty |
| 217 | 219 |
| 218 $ hg rollback | 220 $ hg rollback |
| 219 rolling back to revision -1 (undo pull) | 221 repository tip rolled back to revision -1 (undo pull) |
| 222 working directory now based on revision -1 | |
| 220 $ cd .. | 223 $ cd .. |
| 221 | 224 |
| 222 Log -R bundle:empty+full.hg | 225 Log -R bundle:empty+full.hg |
| 223 | 226 |
| 224 $ hg -R bundle:empty+full.hg log --template="{rev} "; echo "" | 227 $ hg -R bundle:empty+full.hg log --template="{rev} "; echo "" |