upstream/mercurial-mirror Files · tests/test-casecollision.t

largefiles: unlink standins not known to the restored dirstate at rollback...

largefiles: unlink standins not known to the restored dirstate at rollback Before this patch, standinds not known to the restored dirstate at rollback still exist after rollback of the parent of the working directory, and they become orphans unexpectedly. This patch unlinks standins not known to the restored dirstate. This patch saves names of standins matched against not "repo.dirstate[f] == 'a'" but "repo.dirstate[f] != 'r'" before rollback, because branch merging marks files newly added to dirstate as not "a" but "n". Such standins will also become orphan after rollback, because they are not known to the restored dirstate.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r22286:3f3b9483

default

Download file

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

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require no-icasefs

        Kevin Gessner
    
add: notify when adding a file that would cause a case-folding collision...

              r14068
            
      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

        Joshua Redstone
    
casecollision: add tests...

              r17096
            
        $ 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

        Adrian Buehlmann
    
test-casecollision.t: add test for case changing rename

              r14178
            
      case changing rename must not warn or abort

        $ echo c > c

        $ hg ci -qAmx

        $ hg mv c C

        Kevin Gessner
    
add: notify when adding a file that would cause a case-folding collision...

              r14068
            
        $ 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

Matt Mackall tests: replace exit 80 with #require	r22046	#require no-icasefs
Kevin Gessner add: notify when adding a file that would cause a case-folding collision...	r14068
		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
Joshua Redstone casecollision: add tests...	r17096	$ 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
Adrian Buehlmann test-casecollision.t: add test for case changing rename	r14178
		case changing rename must not warn or abort

		$ echo c > c
		$ hg ci -qAmx
		$ hg mv c C
Kevin Gessner add: notify when adding a file that would cause a case-folding collision...	r14068	$ cd ..