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

resolve: fix incorrect merge...

resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

Siddharth Agarwal - - Load All Authors

File last commit:

r19124:4cdec37f default


                r27025:ec372573

default

Download file

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

        $ hg init a

        $ cd a

        $ hg init b

        $ echo x > b/x

      Should print nothing:

        $ hg add b

        $ hg st

        $ echo y > b/y

        $ hg st

      Should fail:

        $ hg st b/x

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

        [255]

        $ hg add b/x

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

        [255]

      Should fail:

        $ hg add b b/x

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

        [255]

        $ hg st

      Should arguably print nothing:

        $ hg st b

        $ echo a > a

        $ hg ci -Ama a

      Should fail:

        $ hg mv a b

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

        [255]

        $ hg st

        $ 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 init b
				$ echo x > b/x

				Should print nothing:

				$ hg add b
				$ hg st

				$ echo y > b/y
				$ hg st

				Should fail:

				$ hg st b/x
				abort: path 'b/x' is inside nested repo 'b' (glob)
				[255]
				$ hg add b/x
				abort: path 'b/x' is inside nested repo 'b' (glob)
				[255]

				Should fail:

				$ hg add b b/x
				abort: path 'b/x' is inside nested repo 'b' (glob)
				[255]
				$ hg st

				Should arguably print nothing:

				$ hg st b

				$ echo a > a
				$ hg ci -Ama a

				Should fail:

				$ hg mv a b
				abort: path 'b/a' is inside nested repo 'b' (glob)
				[255]
				$ hg st

				$ cd ..