upstream/mercurial-mirror Files · tests/test-manifest.t

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Mads Kiilerich - - Load All Authors

File last commit:

r16907:91dc9587 default


                r22285:85bded43

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]