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

Olle Lundberg - - Load All Authors

File last commit:

r20832:5d57b210 default


                r22287:f3ac9677

default

Download file

             rebase.sh
        
                    44 lines
            
             | 484 B
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / bundles / rebase.sh
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Olle Lundberg
    
tests: don't hardcode path to bash interpreter...

              r20832
            
      #!/usr/bin/env bash

        Nicolas Dumazet
    
tests: introduce a rebase bundle to use with rebase tests...

              r14118
            
      hg init rebase

      cd rebase

        Nicolas Dumazet
    
tests: upgrade bundles/rebase.hg to support test-rebase-collapse...

              r14119
            
      #  @  7: 'H'

      #  |

      #  | o  6: 'G'

      #  |/|

      #  o |  5: 'F'

      #  | |

      #  | o  4: 'E'

      #  |/

      #  | o  3: 'D'

      #  | |

      #  | o  2: 'C'

      #  | |

      #  | o  1: 'B'

      #  |/

      #  o  0: 'A'

        Nicolas Dumazet
    
tests: introduce a rebase bundle to use with rebase tests...

              r14118
            
      echo A > A

      hg ci -Am A

      echo B > B

      hg ci -Am B

      echo C > C

      hg ci -Am C

      echo D > D

      hg ci -Am D

        Nicolas Dumazet
    
tests: upgrade bundles/rebase.hg to support test-rebase-collapse...

              r14119
            
      hg up -q -C 0

      echo E > E

      hg ci -Am E

      hg up -q -C 0

        Nicolas Dumazet
    
tests: introduce a rebase bundle to use with rebase tests...

              r14118
            
      echo F > F

      hg ci -Am F

        Nicolas Dumazet
    
tests: upgrade bundles/rebase.hg to support test-rebase-collapse...

              r14119
            
      hg merge -r 4

      hg ci -m G

      hg up -q -C 5

      echo H > H

      hg ci -Am H

        Nicolas Dumazet
    
tests: introduce a rebase bundle to use with rebase tests...

              r14118
            
      hg bundle -a ../rebase.hg

      cd ..

      rm -Rf rebase

	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

Olle Lundberg tests: don't hardcode path to bash interpreter...	r20832	#!/usr/bin/env bash
Nicolas Dumazet tests: introduce a rebase bundle to use with rebase tests...	r14118	hg init rebase
		cd rebase

Nicolas Dumazet tests: upgrade bundles/rebase.hg to support test-rebase-collapse...	r14119	# @ 7: 'H'
		# \|
		# \| o 6: 'G'
		# \|/\|
		# o \| 5: 'F'
		# \| \|
		# \| o 4: 'E'
		# \|/
		# \| o 3: 'D'
		# \| \|
		# \| o 2: 'C'
		# \| \|
		# \| o 1: 'B'
		# \|/
		# o 0: 'A'

Nicolas Dumazet tests: introduce a rebase bundle to use with rebase tests...	r14118	echo A > A
		hg ci -Am A
		echo B > B
		hg ci -Am B
		echo C > C
		hg ci -Am C
		echo D > D
		hg ci -Am D
Nicolas Dumazet tests: upgrade bundles/rebase.hg to support test-rebase-collapse...	r14119	hg up -q -C 0
		echo E > E
		hg ci -Am E
		hg up -q -C 0
Nicolas Dumazet tests: introduce a rebase bundle to use with rebase tests...	r14118	echo F > F
		hg ci -Am F
Nicolas Dumazet tests: upgrade bundles/rebase.hg to support test-rebase-collapse...	r14119	hg merge -r 4
		hg ci -m G
		hg up -q -C 5
		echo H > H
		hg ci -Am H
Nicolas Dumazet tests: introduce a rebase bundle to use with rebase tests...	r14118
		hg bundle -a ../rebase.hg

		cd ..
		rm -Rf rebase