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

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r32255:7e35d31b

default

Download file

             test-casecollision.t
        
                    69 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-casecollision.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require no-icasefs

      test file addition with colliding case

        $ hg init repo1

        $ cd repo1

        $ echo a > a

        $ echo A > A

        $ hg add a

        $ hg st

        A a

        ? A

        $ hg add --config ui.portablefilenames=abort A

        abort: possible case-folding collision for A

        [255]

        $ hg st

        A a

        ? A

        $ hg add A

        warning: possible case-folding collision for A

        $ hg st

        A A

        A a

        $ hg forget A

        $ hg st

        A a

        ? A

        $ hg add --config ui.portablefilenames=no A

        $ hg st

        A A

        A a

        $ mkdir b

        $ touch b/c b/D

        $ hg add b

        adding b/D

        adding b/c

        $ touch b/d b/C

        $ hg add b/C

        warning: possible case-folding collision for b/C

        $ hg add b/d

        warning: possible case-folding collision for b/d

        $ touch b/a1 b/a2

        $ hg add b

        adding b/a1

        adding b/a2

        $ touch b/A2 b/a1.1

        $ hg add b/a1.1 b/A2

        warning: possible case-folding collision for b/A2

        $ touch b/f b/F

        $ hg add b/f b/F

        warning: possible case-folding collision for b/f

        $ touch g G

        $ hg add g G

        warning: possible case-folding collision for g

        $ mkdir h H

        $ touch h/x H/x

        $ hg add h/x H/x

        warning: possible case-folding collision for h/x

        $ touch h/s H/s

        $ hg add h/s

        $ hg add H/s

        warning: possible case-folding collision for H/s

      case changing rename must not warn or abort

        $ echo c > c

        $ hg ci -qAmx

        $ hg mv c C

        $ 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

				#require no-icasefs

				test file addition with colliding case

				$ hg init repo1
				$ cd repo1
				$ echo a > a
				$ echo A > A
				$ hg add a
				$ hg st
				A a
				? A
				$ hg add --config ui.portablefilenames=abort A
				abort: possible case-folding collision for A
				[255]
				$ hg st
				A a
				? A
				$ hg add A
				warning: possible case-folding collision for A
				$ hg st
				A A
				A a
				$ hg forget A
				$ hg st
				A a
				? A
				$ hg add --config ui.portablefilenames=no A
				$ hg st
				A A
				A a
				$ mkdir b
				$ touch b/c b/D
				$ hg add b
				adding b/D
				adding b/c
				$ touch b/d b/C
				$ hg add b/C
				warning: possible case-folding collision for b/C
				$ hg add b/d
				warning: possible case-folding collision for b/d
				$ touch b/a1 b/a2
				$ hg add b
				adding b/a1
				adding b/a2
				$ touch b/A2 b/a1.1
				$ hg add b/a1.1 b/A2
				warning: possible case-folding collision for b/A2
				$ touch b/f b/F
				$ hg add b/f b/F
				warning: possible case-folding collision for b/f
				$ touch g G
				$ hg add g G
				warning: possible case-folding collision for g
				$ mkdir h H
				$ touch h/x H/x
				$ hg add h/x H/x
				warning: possible case-folding collision for h/x
				$ touch h/s H/s
				$ hg add h/s
				$ hg add H/s
				warning: possible case-folding collision for H/s

				case changing rename must not warn or abort

				$ echo c > c
				$ hg ci -qAmx
				$ hg mv c C
				$ cd ..