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

convert/mtn: convert suspended branches as closed branches...

convert/mtn: convert suspended branches as closed branches Monotone treats branch closing ("suspending") in a similar manner to how we do in mercurial - a cert is added to a revision that marks the branch to be hidden. If a subsequent commit is made, the branch is effectively reopened.

Oleg Stepanov - - Load All Authors

File last commit:

r13437:6169493a stable


                r13779:c13bfa45

default

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]