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

mergestate: handle additional record types specially...

mergestate: handle additional record types specially This works around a bug in older Mercurial versions' handling of the v2 merge state. We also add a bunch of tests that make sure that (1) we correctly abort when the merge state has an unsupported record type (2) aborting the merge, rebase or histedit continues to work and clears out the merge state.

Olle Lundberg - - Load All Authors

File last commit:

r20832:5d57b210 default


                r27027:a01ecbcf

default

Download file

             remote.sh
        
                    32 lines
            
             | 520 B
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / bundles / remote.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/env bash

      hg init remote

      cd remote

      echo "0" >> afile

      hg add afile

      hg commit -m "0.0"

      echo "1" >> afile

      hg commit -m "0.1"

      echo "2" >> afile

      hg commit -m "0.2"

      echo "3" >> afile

      hg commit -m "0.3"

      hg update -C 0

      echo "1" >> afile

      hg commit -m "1.1"

      echo "2" >> afile

      hg commit -m "1.2"

      echo "a line" > fred

      echo "3" >> afile

      hg add fred

      hg commit -m "1.3"

      hg mv afile adifferentfile

      hg commit -m "1.3m"

      hg update -C 3

      hg mv afile anotherfile

      hg commit -m "0.3m"

      hg bundle -a ../remote.hg

      cd ..

      rm -Rf remote

	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 remote
				cd remote

				echo "0" >> afile
				hg add afile
				hg commit -m "0.0"
				echo "1" >> afile
				hg commit -m "0.1"
				echo "2" >> afile
				hg commit -m "0.2"
				echo "3" >> afile
				hg commit -m "0.3"
				hg update -C 0
				echo "1" >> afile
				hg commit -m "1.1"
				echo "2" >> afile
				hg commit -m "1.2"
				echo "a line" > fred
				echo "3" >> afile
				hg add fred
				hg commit -m "1.3"
				hg mv afile adifferentfile
				hg commit -m "1.3m"
				hg update -C 3
				hg mv afile anotherfile
				hg commit -m "0.3m"

				hg bundle -a ../remote.hg

				cd ..
				rm -Rf remote