test-bookmarks-strip.t
117 lines
| 1.9 KiB
| text/troff
|
Tads3Lexer
/ tests / test-bookmarks-strip.t
Martin Geisler
|
r11864 | $ echo "[extensions]" >> $HGRCPATH | ||
$ echo "mq=" >> $HGRCPATH | ||||
$ hg init | ||||
$ echo qqq>qqq.txt | ||||
David Soria Parra
|
r13307 | rollback dry run without rollback information | ||
$ hg rollback | ||||
no rollback information available | ||||
[1] | ||||
Martin Geisler
|
r11864 | add file | ||
$ hg add | ||||
adding qqq.txt | ||||
commit first revision | ||||
Martin Geisler
|
r12156 | $ hg ci -m 1 | ||
Martin Geisler
|
r11864 | |||
set bookmark | ||||
$ hg book test | ||||
$ echo www>>qqq.txt | ||||
commit second revision | ||||
Martin Geisler
|
r12156 | $ hg ci -m 2 | ||
Martin Geisler
|
r11864 | |||
set bookmark | ||||
$ hg book test2 | ||||
timeless@mozdev.org
|
r17497 | update to -2 (deactivates the active bookmark) | ||
Martin Geisler
|
r11864 | |||
$ hg update -r -2 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Siddharth Agarwal
|
r21404 | (leaving bookmark test2) | ||
Martin Geisler
|
r11864 | |||
$ echo eee>>qqq.txt | ||||
commit new head | ||||
Martin Geisler
|
r12156 | $ hg ci -m 3 | ||
Martin Geisler
|
r11864 | created new head | ||
bookmarks updated? | ||||
$ hg book | ||||
Martin Geisler
|
r12156 | test 1:25e1ee7a0081 | ||
test2 1:25e1ee7a0081 | ||||
Martin Geisler
|
r11864 | |||
strip to revision 1 | ||||
Nicolas Dumazet
|
r11907 | $ hg strip 1 | ||
Mads Kiilerich
|
r12640 | saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob) | ||
Martin Geisler
|
r11864 | |||
list bookmarks | ||||
$ hg book | ||||
Augie Fackler
|
r17264 | test 0:5c9ad3787638 | ||
test2 0:5c9ad3787638 | ||||
Martin Geisler
|
r11864 | |||
Patrick Mezard
|
r12394 | immediate rollback and reentrancy issue | ||
$ echo "mq=!" >> $HGRCPATH | ||||
$ hg init repo | ||||
$ cd repo | ||||
$ echo a > a | ||||
$ hg ci -Am adda | ||||
adding a | ||||
$ echo b > b | ||||
$ hg ci -Am addb | ||||
adding b | ||||
$ hg bookmarks markb | ||||
$ hg rollback | ||||
Gilles Moris
|
r13446 | repository tip rolled back to revision 0 (undo commit) | ||
working directory now based on revision 0 | ||||
Patrick Mezard
|
r12394 | |||
are you there? | ||||
$ hg bookmarks | ||||
no bookmarks set | ||||
Benoit Boissinot
|
r13627 | can we commit? (issue2692) | ||
$ echo c > c | ||||
$ hg ci -Am rockon | ||||
adding c | ||||
Patrick Mezard
|
r12394 | can you be added again? | ||
$ hg bookmarks markb | ||||
$ hg bookmarks | ||||
Benoit Boissinot
|
r13627 | * markb 1:fdb34407462c | ||
David Soria Parra
|
r13307 | |||
rollback dry run with rollback information | ||||
$ hg rollback -n | ||||
Benoit Boissinot
|
r13627 | repository tip rolled back to revision 0 (undo commit) | ||
$ hg bookmarks | ||||
* markb 1:fdb34407462c | ||||
rollback dry run with rollback information and no commit undo | ||||
$ rm .hg/store/undo | ||||
$ hg rollback -n | ||||
Matt Mackall
|
r13356 | no rollback information available | ||
[1] | ||||
David Soria Parra
|
r13307 | $ hg bookmarks | ||
Benoit Boissinot
|
r13627 | * markb 1:fdb34407462c | ||
David Soria Parra
|
r13307 | |||
Patrick Mezard
|
r12394 | $ cd .. | ||