##// END OF EJS Templates
Merge spelling fixes
Merge spelling fixes

File last commit:

r17497:b682997d default
r17537:31f32a96 merge default
Show More
test-bookmarks-strip.t
116 lines | 1.9 KiB | text/troff | Tads3Lexer
/ tests / test-bookmarks-strip.t
Martin Geisler
tests: unify test-bookmarks-strip
r11864 $ echo "[extensions]" >> $HGRCPATH
$ echo "mq=" >> $HGRCPATH
$ hg init
$ echo qqq>qqq.txt
David Soria Parra
bookmarks: respect rollbacks dryrun parameter
r13307 rollback dry run without rollback information
$ hg rollback
no rollback information available
[1]
Martin Geisler
tests: unify test-bookmarks-strip
r11864 add file
$ hg add
adding qqq.txt
commit first revision
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg ci -m 1
Martin Geisler
tests: unify test-bookmarks-strip
r11864
set bookmark
$ hg book test
$ echo www>>qqq.txt
commit second revision
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg ci -m 2
Martin Geisler
tests: unify test-bookmarks-strip
r11864
set bookmark
$ hg book test2
timeless@mozdev.org
spelling: deactivates
r17497 update to -2 (deactivates the active bookmark)
Martin Geisler
tests: unify test-bookmarks-strip
r11864
$ hg update -r -2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo eee>>qqq.txt
commit new head
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg ci -m 3
Martin Geisler
tests: unify test-bookmarks-strip
r11864 created new head
bookmarks updated?
$ hg book
Martin Geisler
tests: remove unneeded -d flags...
r12156 test 1:25e1ee7a0081
test2 1:25e1ee7a0081
Martin Geisler
tests: unify test-bookmarks-strip
r11864
strip to revision 1
Nicolas Dumazet
tests: use regular expressions instead of helpers
r11907 $ hg strip 1
Mads Kiilerich
tests: remove redundant globs...
r12640 saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)
Martin Geisler
tests: unify test-bookmarks-strip
r11864
list bookmarks
$ hg book
Augie Fackler
strip: move bookmarks to nearest ancestor rather than '.'...
r17264 test 0:5c9ad3787638
test2 0:5c9ad3787638
Martin Geisler
tests: unify test-bookmarks-strip
r11864
Patrick Mezard
Merge with stable
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
rollback: clarifies the message about the reverted state (issue2628)...
r13446 repository tip rolled back to revision 0 (undo commit)
working directory now based on revision 0
Patrick Mezard
Merge with stable
r12394
are you there?
$ hg bookmarks
no bookmarks set
Benoit Boissinot
bookmarks: discard current bookmark if absent from the bookmarks (issue2692)...
r13627 can we commit? (issue2692)
$ echo c > c
$ hg ci -Am rockon
adding c
Patrick Mezard
Merge with stable
r12394 can you be added again?
$ hg bookmarks markb
$ hg bookmarks
Benoit Boissinot
bookmarks: discard current bookmark if absent from the bookmarks (issue2692)...
r13627 * markb 1:fdb34407462c
David Soria Parra
bookmarks: respect rollbacks dryrun parameter
r13307
rollback dry run with rollback information
$ hg rollback -n
Benoit Boissinot
bookmarks: discard current bookmark if absent from the bookmarks (issue2692)...
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
bookmarks: merge rollback support into localrepo
r13356 no rollback information available
[1]
David Soria Parra
bookmarks: respect rollbacks dryrun parameter
r13307 $ hg bookmarks
Benoit Boissinot
bookmarks: discard current bookmark if absent from the bookmarks (issue2692)...
r13627 * markb 1:fdb34407462c
David Soria Parra
bookmarks: respect rollbacks dryrun parameter
r13307
Patrick Mezard
Merge with stable
r12394 $ cd ..