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

transplant: use peer of source repository as "remote" for "repo.pull()"...

transplant: use peer of source repository as "remote" for "repo.pull()" Before this patch, transplant with "--merge" option fails with traceback unexpectedly, if it causes pull from the source repository on the local host. "discovery.findcommonincoming()" invokes "capable()" method on the object given from "localrepository.pull()", but it is "localrepository" object in this case and doesn't have such method. This patch uses peer object of source repository as "remote" argument for "localrepository.pull()" invocation like other invocations of it in transplant.py.

Siddharth Agarwal - - Load All Authors

File last commit:

r19803:0f64af33 default


                r20020:6fb59247

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]