upstream/mercurial-mirror Files · tests/test-revset-dirstate-parents.t

strip: move bookmarks to nearest ancestor rather than '.'...

strip: move bookmarks to nearest ancestor rather than '.' If you've got this graph: 0-1-2 \ 3 and 3 is checked out, 2 is bookmarked with "broken", and you do "hg strip 2", the bookmark will move to 3, not 1. That's always struck me as a bug. This change makes bookmarks move to the tipmost ancestor of the stripped set rather than the currently-checked-out revision, which is what I always expected should happen.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r17264:ec7b9bec

stable

Download file

             test-revset-dirstate-parents.t
        
                    60 lines
            
             | 816 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revset-dirstate-parents.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ HGENCODING=utf-8

        $ export HGENCODING

        $ try() {

        >   hg debugrevspec --debug $@

        > }

        $ log() {

        >   hg log --template '{rev}\n' -r "$1"

        > }

        $ hg init repo

        $ cd repo

        $ try 'p1()'

        (func

          ('symbol', 'p1')

          None)

        $ try 'p2()'

        (func

          ('symbol', 'p2')

          None)

        $ try 'parents()'

        (func

          ('symbol', 'parents')

          None)

      null revision

        $ log 'p1()'

        $ log 'p2()'

        $ log 'parents()'

      working dir with a single parent

        $ echo a > a

        $ hg ci -Aqm0

        $ log 'p1()'

        0

        $ log 'tag() and p1()'

        $ log 'p2()'

        $ log 'parents()'

        0

        $ log 'tag() and parents()'

      merge in progress

        $ echo b > b

        $ hg ci -Aqm1

        $ hg up -q 0

        $ echo c > c

        $ hg ci -Aqm2

        $ hg merge -q

        $ log 'p1()'

        2

        $ log 'p2()'

        1

        $ log 'tag() and p2()'

        $ log 'parents()'

        1

        2

        $ 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

				$ HGENCODING=utf-8
				$ export HGENCODING

				$ try() {
				> hg debugrevspec --debug $@
				> }

				$ log() {
				> hg log --template '{rev}\n' -r "$1"
				> }

				$ hg init repo
				$ cd repo

				$ try 'p1()'
				(func
				('symbol', 'p1')
				None)
				$ try 'p2()'
				(func
				('symbol', 'p2')
				None)
				$ try 'parents()'
				(func
				('symbol', 'parents')
				None)

				null revision
				$ log 'p1()'
				$ log 'p2()'
				$ log 'parents()'

				working dir with a single parent
				$ echo a > a
				$ hg ci -Aqm0
				$ log 'p1()'
				0
				$ log 'tag() and p1()'
				$ log 'p2()'
				$ log 'parents()'
				0
				$ log 'tag() and parents()'

				merge in progress
				$ echo b > b
				$ hg ci -Aqm1
				$ hg up -q 0
				$ echo c > c
				$ hg ci -Aqm2
				$ hg merge -q
				$ log 'p1()'
				2
				$ log 'p2()'
				1
				$ log 'tag() and p2()'
				$ log 'parents()'
				1
				2

				$ cd ..