upstream/mercurial-mirror Files · tests/test-diff-hashes.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-diff-hashes.t
        
                    46 lines
            
             | 1013 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-hashes.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init a

        $ cd a

        $ hg diff inexistent1 inexistent2

        inexistent1: * (glob)

        inexistent2: * (glob)

        $ echo bar > foo

        $ hg add foo

        $ hg ci -m 'add foo'

        $ echo foobar > foo

        $ hg ci -m 'change foo'

        $ hg --quiet diff -r 0 -r 1

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

        +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

        @@ -1,1 +1,1 @@

        -bar

        +foobar

        $ hg diff -r 0 -r 1

        diff -r a99fb63adac3 -r 9b8568d3af2f foo

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

        +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

        @@ -1,1 +1,1 @@

        -bar

        +foobar

        $ hg --verbose diff -r 0 -r 1

        diff -r a99fb63adac3 -r 9b8568d3af2f foo

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

        +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

        @@ -1,1 +1,1 @@

        -bar

        +foobar

        $ hg --debug diff -r 0 -r 1

        diff -r a99fb63adac3f31816a22f665bc3b7a7655b30f4 -r 9b8568d3af2f1749445eef03aede868a6f39f210 foo

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

        +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

        @@ -1,1 +1,1 @@

        -bar

        +foobar

        $ 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

				$ hg init a
				$ cd a

				$ hg diff inexistent1 inexistent2
				inexistent1: * (glob)
				inexistent2: * (glob)

				$ echo bar > foo
				$ hg add foo
				$ hg ci -m 'add foo'

				$ echo foobar > foo
				$ hg ci -m 'change foo'

				$ hg --quiet diff -r 0 -r 1
				--- a/foo Thu Jan 01 00:00:00 1970 +0000
				+++ b/foo Thu Jan 01 00:00:00 1970 +0000
				@@ -1,1 +1,1 @@
				-bar
				+foobar

				$ hg diff -r 0 -r 1
				diff -r a99fb63adac3 -r 9b8568d3af2f foo
				--- a/foo Thu Jan 01 00:00:00 1970 +0000
				+++ b/foo Thu Jan 01 00:00:00 1970 +0000
				@@ -1,1 +1,1 @@
				-bar
				+foobar

				$ hg --verbose diff -r 0 -r 1
				diff -r a99fb63adac3 -r 9b8568d3af2f foo
				--- a/foo Thu Jan 01 00:00:00 1970 +0000
				+++ b/foo Thu Jan 01 00:00:00 1970 +0000
				@@ -1,1 +1,1 @@
				-bar
				+foobar

				$ hg --debug diff -r 0 -r 1
				diff -r a99fb63adac3f31816a22f665bc3b7a7655b30f4 -r 9b8568d3af2f1749445eef03aede868a6f39f210 foo
				--- a/foo Thu Jan 01 00:00:00 1970 +0000
				+++ b/foo Thu Jan 01 00:00:00 1970 +0000
				@@ -1,1 +1,1 @@
				-bar
				+foobar

				$ cd ..