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

update: omit redundant activating message for already active bookmark...

update: omit redundant activating message for already active bookmark This patch also adds "hg bookmarks" invocation into tests, where redundant message is omitted but bookmark activity isn't clear from context.

Siddharth Agarwal - - Load All Authors

File last commit:

r19803:0f64af33 default


                r28500:2e1bceee

default

Download file

             test-merge-subrepos.t
        
                    25 lines
            
             | 438 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

        Siddharth Agarwal
    
merge: standardize error message for dirty subrepo

              r19803
            
        abort: uncommitted changes in subrepository 'subrepo'

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

              r13437
            
        [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
Siddharth Agarwal merge: standardize error message for dirty subrepo	r19803	abort: uncommitted changes in subrepository 'subrepo'
Oleg Stepanov Do not allow merging with uncommitted changes in a subrepo	r13437	[255]