upstream/mercurial-mirror Files · tests/test-issue1089.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.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22287:f3ac9677

default

Download file

             test-issue1089.t
        
                    26 lines
            
             | 321 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1089.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: fix a bunch of pointless #s in unified tests

              r12328
            
      http://mercurial.selenic.com/bts/issue1089

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg init

        $ mkdir a

        $ echo a > a/b

        $ hg ci -Am m

        adding a/b

        $ hg rm a

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        removing a/b (glob)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg ci -m m a

        $ mkdir a b

        $ echo a > a/b

        $ hg ci -Am m

        adding a/b

        $ hg rm a

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        removing a/b (glob)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ cd b

      Relative delete:

        $ hg ci -m m ../a

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ cd ..

	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

Matt Mackall tests: fix a bunch of pointless #s in unified tests	r12328	http://mercurial.selenic.com/bts/issue1089
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg init
		$ mkdir a
		$ echo a > a/b
		$ hg ci -Am m
		adding a/b

		$ hg rm a
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	removing a/b (glob)
Adrian Buehlmann tests: unify test-issue*	r12195	$ hg ci -m m a

		$ mkdir a b
		$ echo a > a/b
		$ hg ci -Am m
		adding a/b

		$ hg rm a
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	removing a/b (glob)
Adrian Buehlmann tests: unify test-issue*	r12195	$ cd b

		Relative delete:

		$ hg ci -m m ../a

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..