upstream/mercurial-mirror Files · tests/test-import-unknown.t

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r32255:7e35d31b

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 ..