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

largefiles: restore standins from non branch-tip parent at rollback correctly...

largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

Siddharth Agarwal - - Load All Authors

File last commit:

r21404:ca275f7e default


                r22284:72b37865

default

Download file

             test-bookmarks-strip.t
        
                    117 lines
            
             | 1.9 KiB
            
                | 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

      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

        repository tip rolled back to revision 0 (undo commit)

        working directory now based on revision 0

      are you there?

        $ hg bookmarks

        no bookmarks set

      can we commit? (issue2692)

        $ echo c > c

        $ hg ci -Am rockon

        adding c

      can you be added again?

        $ hg bookmarks markb

        $ hg bookmarks

         * markb                     1:fdb34407462c

      rollback dry run with rollback information

        $ hg rollback -n

        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

        no rollback information available

        [1]

        $ hg bookmarks

         * markb                     1:fdb34407462c

        $ cd ..

	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

				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
				repository tip rolled back to revision 0 (undo commit)
				working directory now based on revision 0

				are you there?

				$ hg bookmarks
				no bookmarks set

				can we commit? (issue2692)

				$ echo c > c
				$ hg ci -Am rockon
				adding c

				can you be added again?

				$ hg bookmarks markb
				$ hg bookmarks
				* markb 1:fdb34407462c

				rollback dry run with rollback information

				$ hg rollback -n
				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
				no rollback information available
				[1]
				$ hg bookmarks
				* markb 1:fdb34407462c

				$ cd ..