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

url: Remove the proxy env variables only when needed (issue2451)...

url: Remove the proxy env variables only when needed (issue2451) This is an attempt to fix issue 2451 and its duplicates (2599 and 2949, AFAIK). Its main idea is that it is only necessary to clean the proxy environment variables *when* http_proxy is set in the config file (since it takes precedence over the environment variables). Otherwise, hg shouldn't bother with them, since they will most likely be used to reach the server.

Oleg Stepanov - - Load All Authors

File last commit:

r13437:6169493a stable


                r15077:02734d2b

stable

Download file

             test-merge-subrepos.t
        
                    25 lines
            
             | 450 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: outstanding 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: outstanding uncommitted changes in subrepository 'subrepo'
				[255]