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

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.

Siddharth Agarwal - - Load All Authors

File last commit:

r19803:0f64af33 default


                r22287:f3ac9677

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]