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

Mads Kiilerich - - Load All Authors

File last commit:

r16907:91dc9587 default


                r22284:72b37865

default

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]