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

subrepo: use low-level git-diff-index for dirty()...

subrepo: use low-level git-diff-index for dirty() Despite its name, git-diff-index compares a revision to the files in the working directory. This seems way less sketchy and more future proof than parsing human-readable git-status.

Matt Mackall - - Load All Authors

File last commit:

r12328:b63f6422 default


                r13153:dca5488f

default

Download file

             test-issue322.t
        
                    59 lines
            
             | 828 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue322.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      http://mercurial.selenic.com/bts/issue322

      File replaced with directory:

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg commit -Ama

        adding a

        $ rm a

        $ mkdir a

        $ echo a > a/a

      Should fail - would corrupt dirstate:

        $ hg add a/a

        abort: file 'a' in dirstate clashes with 'a/a'

        [255]

        $ cd ..

      Directory replaced with file:

        $ hg init c

        $ cd c

        $ mkdir a

        $ echo a > a/a

        $ hg commit -Ama

        adding a/a

        $ rm -r a

        $ echo a > a

      Should fail - would corrupt dirstate:

        $ hg add a

        abort: directory 'a' already in dirstate

        [255]

        $ cd ..

      Directory replaced with file:

        $ hg init d

        $ cd d

        $ mkdir b

        $ mkdir b/c

        $ echo a > b/c/d

        $ hg commit -Ama

        adding b/c/d

        $ rm -r b

        $ echo a > b

      Should fail - would corrupt dirstate:

        $ hg add b

        abort: directory 'b' already in dirstate

        [255]

	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

				http://mercurial.selenic.com/bts/issue322

				File replaced with directory:

				$ hg init a
				$ cd a
				$ echo a > a
				$ hg commit -Ama
				adding a
				$ rm a
				$ mkdir a
				$ echo a > a/a

				Should fail - would corrupt dirstate:

				$ hg add a/a
				abort: file 'a' in dirstate clashes with 'a/a'
				[255]

				$ cd ..

				Directory replaced with file:

				$ hg init c
				$ cd c
				$ mkdir a
				$ echo a > a/a
				$ hg commit -Ama
				adding a/a

				$ rm -r a
				$ echo a > a

				Should fail - would corrupt dirstate:

				$ hg add a
				abort: directory 'a' already in dirstate
				[255]

				$ cd ..

				Directory replaced with file:

				$ hg init d
				$ cd d
				$ mkdir b
				$ mkdir b/c
				$ echo a > b/c/d
				$ hg commit -Ama
				adding b/c/d
				$ rm -r b
				$ echo a > b

				Should fail - would corrupt dirstate:

				$ hg add b
				abort: directory 'b' already in dirstate
				[255]