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

r16913:f2719b38 default


                r22285:85bded43

default

Download file

             test-import-unknown.t
        
                    69 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-import-unknown.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > purge =

        > EOF

        $ hg init test

        $ cd test

        $ echo a > changed

        $ echo a > removed

        $ echo a > source

        $ hg ci -Am addfiles

        adding changed

        adding removed

        adding source

        $ echo a >> changed

        $ echo a > added

        $ hg add added

        $ hg rm removed

        $ hg cp source copied

        $ hg diff --git > ../unknown.diff

      Test adding on top of an unknown file

        $ hg up -qC 0

        $ hg purge

        $ echo a > added

        $ hg import --no-commit ../unknown.diff

        applying ../unknown.diff

        file added already exists

        1 out of 1 hunks FAILED -- saving rejects to file added.rej

        abort: patch failed to apply

        [255]

      Test modifying an unknown file

        $ hg revert -aq

        $ hg purge

        $ hg rm changed

        $ hg ci -m removechanged

        $ echo a > changed

        $ hg import --no-commit ../unknown.diff

        applying ../unknown.diff

        abort: cannot patch changed: file is not tracked

        [255]

      Test removing an unknown file

        $ hg up -qC 0

        $ hg purge

        $ hg rm removed

        $ hg ci -m removeremoved

        created new head

        $ echo a > removed

        $ hg import --no-commit ../unknown.diff

        applying ../unknown.diff

        abort: cannot patch removed: file is not tracked

        [255]

      Test copying onto an unknown file

        $ hg up -qC 0

        $ hg purge

        $ echo a > copied

        $ hg import --no-commit ../unknown.diff

        applying ../unknown.diff

        abort: cannot create copied: destination already exists

        [255]

        $ 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

				$ cat <<EOF >> $HGRCPATH
				> [extensions]
				> purge =
				> EOF

				$ hg init test
				$ cd test
				$ echo a > changed
				$ echo a > removed
				$ echo a > source
				$ hg ci -Am addfiles
				adding changed
				adding removed
				adding source
				$ echo a >> changed
				$ echo a > added
				$ hg add added
				$ hg rm removed
				$ hg cp source copied
				$ hg diff --git > ../unknown.diff

				Test adding on top of an unknown file

				$ hg up -qC 0
				$ hg purge
				$ echo a > added
				$ hg import --no-commit ../unknown.diff
				applying ../unknown.diff
				file added already exists
				1 out of 1 hunks FAILED -- saving rejects to file added.rej
				abort: patch failed to apply
				[255]

				Test modifying an unknown file

				$ hg revert -aq
				$ hg purge
				$ hg rm changed
				$ hg ci -m removechanged
				$ echo a > changed
				$ hg import --no-commit ../unknown.diff
				applying ../unknown.diff
				abort: cannot patch changed: file is not tracked
				[255]

				Test removing an unknown file

				$ hg up -qC 0
				$ hg purge
				$ hg rm removed
				$ hg ci -m removeremoved
				created new head
				$ echo a > removed
				$ hg import --no-commit ../unknown.diff
				applying ../unknown.diff
				abort: cannot patch removed: file is not tracked
				[255]

				Test copying onto an unknown file

				$ hg up -qC 0
				$ hg purge
				$ echo a > copied
				$ hg import --no-commit ../unknown.diff
				applying ../unknown.diff
				abort: cannot create copied: destination already exists
				[255]

				$ cd ..