upstream/mercurial-mirror Files · tests/test-nested-repo.t

update: teach hg to override untracked dir with a tracked file on update...

update: teach hg to override untracked dir with a tracked file on update This is a fix to an old problem when Mercurial got confused by an untracked folder with the same name as one of the files in a commit hg was trying to update to. It is pretty safe to remove this folder if it is empty. Backing up an empty folder seems to go against Mercurial's "don't track dirs" philosophy.

Siddharth Agarwal - - Load All Authors

File last commit:

r19124:4cdec37f default


                r29480:1e4512ea

default

Download file

             test-nested-repo.t
        
                    44 lines
            
             | 587 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-nested-repo.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg init a

        $ cd a

        $ hg init b

        $ echo x > b/x

      Should print nothing:

        $ hg add b

        $ hg st

        Siddharth Agarwal
    
test-nested-repo.t: touch another file inside nested repo...

              r19124
            
        $ echo y > b/y

        $ hg st

        Adrian Buehlmann
    
combine tests

              r12279
            
      Should fail:

        $ hg st b/x

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        abort: path 'b/x' is inside nested repo 'b' (glob)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg add b/x

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        abort: path 'b/x' is inside nested repo 'b' (glob)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
combine tests

              r12279
            
      Should fail:

        $ hg add b b/x

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        abort: path 'b/x' is inside nested repo 'b' (glob)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg st

      Should arguably print nothing:

        $ hg st b

        $ echo a > a

        $ hg ci -Ama a

      Should fail:

        $ hg mv a b

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        abort: path 'b/a' is inside nested repo 'b' (glob)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg st

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

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

Adrian Buehlmann combine tests	r12279	$ hg init a
		$ cd a
		$ hg init b
		$ echo x > b/x

		Should print nothing:

		$ hg add b
		$ hg st

Siddharth Agarwal test-nested-repo.t: touch another file inside nested repo...	r19124	$ echo y > b/y
		$ hg st

Adrian Buehlmann combine tests	r12279	Should fail:

		$ hg st b/x
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	abort: path 'b/x' is inside nested repo 'b' (glob)
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann combine tests	r12279	$ hg add b/x
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	abort: path 'b/x' is inside nested repo 'b' (glob)
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann combine tests	r12279
		Should fail:

		$ hg add b b/x
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	abort: path 'b/x' is inside nested repo 'b' (glob)
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann combine tests	r12279	$ hg st

		Should arguably print nothing:

		$ hg st b

		$ echo a > a
		$ hg ci -Ama a

		Should fail:

		$ hg mv a b
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	abort: path 'b/a' is inside nested repo 'b' (glob)
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann combine tests	r12279	$ hg st

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..