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

rebase: choose default destination the same way as 'hg merge' (BC)...

rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

Olle Lundberg - - Load All Authors

File last commit:

r20832:5d57b210 default


                r28189:fac3a24b

default

Download file

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

      #!/usr/bin/env bash

      hg init rebase

      cd rebase

      #  @  7: 'H'

      #  |

      #  | o  6: 'G'

      #  |/|

      #  o |  5: 'F'

      #  | |

      #  | o  4: 'E'

      #  |/

      #  | o  3: 'D'

      #  | |

      #  | o  2: 'C'

      #  | |

      #  | o  1: 'B'

      #  |/

      #  o  0: 'A'

      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

      hg up -q -C 0

      echo E > E

      hg ci -Am E

      hg up -q -C 0

      echo F > F

      hg ci -Am F

      hg merge -r 4

      hg ci -m G

      hg up -q -C 5

      echo H > H

      hg ci -Am H

      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

				#!/usr/bin/env bash
				hg init rebase
				cd rebase

				# @ 7: 'H'
				# \|
				# \| o 6: 'G'
				# \|/\|
				# o \| 5: 'F'
				# \| \|
				# \| o 4: 'E'
				# \|/
				# \| o 3: 'D'
				# \| \|
				# \| o 2: 'C'
				# \| \|
				# \| o 1: 'B'
				# \|/
				# o 0: 'A'

				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
				hg up -q -C 0
				echo E > E
				hg ci -Am E
				hg up -q -C 0
				echo F > F
				hg ci -Am F
				hg merge -r 4
				hg ci -m G
				hg up -q -C 5
				echo H > H
				hg ci -Am H

				hg bundle -a ../rebase.hg

				cd ..
				rm -Rf rebase