upstream/mercurial-mirror Files · tests/bundles/rename.sh

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.

Patrick Mezard - - Load All Authors

File last commit:

r16551:ebf6d38c stable


                r22287:f3ac9677

default

Download file

             rename.sh
        
                    30 lines
            
             | 346 B
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / bundles / rename.sh
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Patrick Mezard
    
localrepo: add setparents() to adjust dirstate copies (issue3407)...

              r16551
            
      #!/bin/sh

      #  @  3: 'move2'

      #  |

      #  o  2: 'move1'

      #  |

      #  | o  1: 'change'

      #  |/

      #  o  0: 'add'

      hg init copies

      cd copies

      echo a > a

      echo b > b

      echo c > c

      hg ci -Am add

      echo a >> a

      echo b >> b

      echo c >> c

      hg ci -m change

      hg up -qC 0

      hg cp a d

      hg mv b e

      hg mv c f

      hg ci -m move1

      hg mv e g

      hg mv f c

      hg ci -m move2

      hg bundle -a ../renames.hg

      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

Patrick Mezard localrepo: add setparents() to adjust dirstate copies (issue3407)...	r16551	#!/bin/sh

		# @ 3: 'move2'
		# \|
		# o 2: 'move1'
		# \|
		# \| o 1: 'change'
		# \|/
		# o 0: 'add'

		hg init copies
		cd copies
		echo a > a
		echo b > b
		echo c > c
		hg ci -Am add
		echo a >> a
		echo b >> b
		echo c >> c
		hg ci -m change
		hg up -qC 0
		hg cp a d
		hg mv b e
		hg mv c f
		hg ci -m move1
		hg mv e g
		hg mv f c
		hg ci -m move2
		hg bundle -a ../renames.hg
		cd ..