upstream/mercurial-mirror Files · tests/test-bookmarks-strip.t

shelve: directly handle the initial parent alignment...

shelve: directly handle the initial parent alignment Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to handle the parent alignment directly. After this change, we no longer need to use rebase in shelve. Differential Revision: https://phab.mercurial-scm.org/D3693

Pierre-Yves David - - Load All Authors

File last commit:

r25744:e78a80f8 default


                r38637:c829749e

default

Download file

             test-bookmarks-strip.t
        
                    65 lines
            
             | 1007 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-bookmarks-strip.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init

        $ echo qqq>qqq.txt

      rollback dry run without rollback information

        $ hg rollback

        no rollback information available

        [1]

      add file

        $ hg add

        adding qqq.txt

      commit first revision

        $ hg ci -m 1

      set bookmark

        $ hg book test

        $ echo www>>qqq.txt

      commit second revision

        $ hg ci -m 2

      set bookmark

        $ hg book test2

      update to -2 (deactivates the active bookmark)

        $ hg update -r -2

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (leaving bookmark test2)

        $ echo eee>>qqq.txt

      commit new head

        $ hg ci -m 3

        created new head

      bookmarks updated?

        $ hg book

           test                      1:25e1ee7a0081

           test2                     1:25e1ee7a0081

      strip to revision 1

        $ hg strip 1

        saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)

      list bookmarks

        $ hg book

           test                      0:5c9ad3787638

           test2                     0:5c9ad3787638

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				$ echo "[extensions]" >> $HGRCPATH
				$ echo "mq=" >> $HGRCPATH

				$ hg init

				$ echo qqq>qqq.txt

				rollback dry run without rollback information

				$ hg rollback
				no rollback information available
				[1]

				add file

				$ hg add
				adding qqq.txt

				commit first revision

				$ hg ci -m 1

				set bookmark

				$ hg book test

				$ echo www>>qqq.txt

				commit second revision

				$ hg ci -m 2

				set bookmark

				$ hg book test2

				update to -2 (deactivates the active bookmark)

				$ hg update -r -2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(leaving bookmark test2)

				$ echo eee>>qqq.txt

				commit new head

				$ hg ci -m 3
				created new head

				bookmarks updated?

				$ hg book
				test 1:25e1ee7a0081
				test2 1:25e1ee7a0081

				strip to revision 1

				$ hg strip 1
				saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)

				list bookmarks

				$ hg book
				test 0:5c9ad3787638
				test2 0:5c9ad3787638