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

Augie Fackler - - Load All Authors

File last commit:

r22947:c63a09b6 default


                r32255:7e35d31b

default

Download file

             test-diff-newlines.t
        
                    19 lines
            
             | 425 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-newlines.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ $PYTHON -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'

        $ hg ci -Ama -d '1 0'

        adding a

        $ echo clean diff >> a

        $ hg ci -mb -d '2 0'

        $ hg diff -r0 -r1

        diff -r 107ba6f817b5 -r 310ce7989cdc a

        --- a/a	Thu Jan 01 00:00:01 1970 +0000

        +++ b/a	Thu Jan 01 00:00:02 1970 +0000

        @@ -1,2 +1,3 @@

         confuse str.splitlines

         embedded\r (no-eol) (esc)

        newline

        +clean diff

	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

				$ hg init

				$ $PYTHON -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'
				$ hg ci -Ama -d '1 0'
				adding a

				$ echo clean diff >> a
				$ hg ci -mb -d '2 0'

				$ hg diff -r0 -r1
				diff -r 107ba6f817b5 -r 310ce7989cdc a
				--- a/a Thu Jan 01 00:00:01 1970 +0000
				+++ b/a Thu Jan 01 00:00:02 1970 +0000
				@@ -1,2 +1,3 @@
				confuse str.splitlines
				embedded\r (no-eol) (esc)
				newline
				+clean diff