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

resolve: fix incorrect merge...

resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

Olle Lundberg - - Load All Authors

File last commit:

r20832:5d57b210 default


                r27025:ec372573

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