upstream/mercurial-mirror Files · tests/test-merge-subrepos.t

chgserver: invalidate the server if extensions fail to load...

chgserver: invalidate the server if extensions fail to load Previously, if extensions fail to load, chg server will just keep working without those extensions. It will print a warning message but only if a new server starts. This patch invalidates the server if any extension failed to load, but still serve the client (hopefully just) once. It will help chg pass some test cases of test-bad-extension.t.

Siddharth Agarwal - - Load All Authors

File last commit:

r19803:0f64af33 default


                r28536:a979f5b0

default

Download file

             test-merge-subrepos.t
        
                    25 lines
            
             | 438 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-subrepos.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo a > a

        $ hg ci -qAm 'add a'

        $ hg init subrepo

        $ echo 'subrepo = http://example.net/libfoo' > .hgsub

        $ hg ci -qAm 'added subrepo'

        $ hg up -qC 0

        $ echo ax > a

        $ hg ci -m 'changed a'

        created new head

        $ hg up -qC 1

        $ cd subrepo

        $ echo b > b

        $ hg add b

        $ cd ..

      Should fail, since there are added files to subrepo:

        $ hg merge

        abort: uncommitted changes in subrepository 'subrepo'

        [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

				$ hg init

				$ echo a > a
				$ hg ci -qAm 'add a'

				$ hg init subrepo
				$ echo 'subrepo = http://example.net/libfoo' > .hgsub
				$ hg ci -qAm 'added subrepo'

				$ hg up -qC 0
				$ echo ax > a
				$ hg ci -m 'changed a'
				created new head

				$ hg up -qC 1
				$ cd subrepo
				$ echo b > b
				$ hg add b
				$ cd ..

				Should fail, since there are added files to subrepo:

				$ hg merge
				abort: uncommitted changes in subrepository 'subrepo'
				[255]