upstream/mercurial-mirror Files · tests/test-manifest.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:

r16907:91dc9587 default


                r17264:ec7b9bec

stable

Download file

             test-manifest.t
        
                    69 lines
            
             | 1003 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-manifest.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Source bundle was generated with the following script:

      # hg init

      # echo a > a

      # ln -s a l

      # hg ci -Ama -d'0 0'

      # mkdir b

      # echo a > b/a

      # chmod +x b/a

      # hg ci -Amb -d'1 0'

        $ hg init

        $ hg -q pull "$TESTDIR/bundles/test-manifest.hg"

      The next call is expected to return nothing:

        $ hg manifest

        $ hg co

        3 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg manifest

        a

        b/a

        l

        $ hg manifest -v

        644   a

        755 * b/a

        644 @ l

        $ hg manifest --debug

        b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644   a

        b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a

        047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l

        $ hg manifest -r 0

        a

        l

        $ hg manifest -r 1

        a

        b/a

        l

        $ hg manifest -r tip

        a

        b/a

        l

        $ hg manifest tip

        a

        b/a

        l

        $ hg manifest --all

        a

        b/a

        l

      The next two calls are expected to abort:

        $ hg manifest -r 2

        abort: unknown revision '2'!

        [255]

        $ hg manifest -r tip tip

        abort: please specify just one revision

        [255]

	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

				Source bundle was generated with the following script:

				# hg init
				# echo a > a
				# ln -s a l
				# hg ci -Ama -d'0 0'
				# mkdir b
				# echo a > b/a
				# chmod +x b/a
				# hg ci -Amb -d'1 0'

				$ hg init
				$ hg -q pull "$TESTDIR/bundles/test-manifest.hg"

				The next call is expected to return nothing:

				$ hg manifest

				$ hg co
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg manifest
				a
				b/a
				l

				$ hg manifest -v
				644 a
				755 * b/a
				644 @ l

				$ hg manifest --debug
				b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
				b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a
				047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l

				$ hg manifest -r 0
				a
				l

				$ hg manifest -r 1
				a
				b/a
				l

				$ hg manifest -r tip
				a
				b/a
				l

				$ hg manifest tip
				a
				b/a
				l

				$ hg manifest --all
				a
				b/a
				l

				The next two calls are expected to abort:

				$ hg manifest -r 2
				abort: unknown revision '2'!
				[255]

				$ hg manifest -r tip tip
				abort: please specify just one revision
				[255]