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

largefiles: hide .hglf/ prefix for largefiles in hgweb...

largefiles: hide .hglf/ prefix for largefiles in hgweb This makes the manifest view in hgweb match what you see in the working copy and what you get when you download an archive in hgweb.

Oleg Stepanov - - Load All Authors

File last commit:

r13437:6169493a stable


                r16449:874a680a

default

Download file

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

        Oleg Stepanov
    
Do not allow merging with uncommitted changes in a subrepo

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

Oleg Stepanov Do not allow merging with uncommitted changes in a subrepo	r13437	$ 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]