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

histedit: make check for unresolved conflicts explicit (issue5545)...

histedit: make check for unresolved conflicts explicit (issue5545) Previously, we'd rely on the implicit check that `localrepo.commit` did. The problem is that that check only happened when the working copy was dirty. With a "clean" working copy but unresolved conflicts we'd get into a broken state. To fix that, do what rebase does and check for unresolved conflicts at the start of histedit --continue.

Olle Lundberg - - Load All Authors

File last commit:

r20832:5d57b210 default


                r32057:e5ffc91a

stable

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