upstream/mercurial-mirror Files · tests/test-commit-unresolved.t

exchange: support for streaming clone bundles...

exchange: support for streaming clone bundles Now that we have a mechanism to produce and consume streaming clone bundles, we need to teach the human-facing bundle specification parser and the internal bundle file header reading code to be aware of this new format. This patch does so. For the human-facing bundle specification, we choose the name "packed" to describe "streaming clone bundles" because the bundle is essentially a "pack" of raw revlog files that are "packed" together. There should probably be a bikeshed over the name, especially since it is human facing.

Siddharth Agarwal - - Load All Authors

File last commit:

r26614:ef1eb6df default


                r26756:9e272a96

default

Download file

             test-commit-unresolved.t
        
                    46 lines
            
             | 994 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-commit-unresolved.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ addcommit () {

        >     echo $1 > $1

        >     hg add $1

        >     hg commit -d "${2} 0" -m $1

        > }

        $ commit () {

        >     hg commit -d "${2} 0" -m $1

        > }

        $ hg init a

        $ cd a

        $ addcommit "A" 0

        $ addcommit "B" 1

        $ echo "C" >> A

        $ commit "C" 2

        $ hg update -C 0

        1 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ echo "D" >> A

        $ commit "D" 3

        created new head

      Merging a conflict araises

        $ hg merge

        merging A

        warning: conflicts while merging A! (edit, then use 'hg resolve --mark')

        1 files updated, 0 files merged, 0 files removed, 1 files unresolved

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

      Correct the conflict without marking the file as resolved

        $ echo "ABCD" > A

        $ hg commit -m "Merged"

        abort: unresolved merge conflicts (see "hg help resolve")

        [255]

      Mark the conflict as resolved and commit

        $ hg resolve -m A

        (no more unresolved files)

        $ hg commit -m "Merged"

        $ cd ..

	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

				$ addcommit () {
				> echo $1 > $1
				> hg add $1
				> hg commit -d "${2} 0" -m $1
				> }

				$ commit () {
				> hg commit -d "${2} 0" -m $1
				> }

				$ hg init a
				$ cd a
				$ addcommit "A" 0
				$ addcommit "B" 1
				$ echo "C" >> A
				$ commit "C" 2

				$ hg update -C 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ echo "D" >> A
				$ commit "D" 3
				created new head

				Merging a conflict araises

				$ hg merge
				merging A
				warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
				1 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]

				Correct the conflict without marking the file as resolved

				$ echo "ABCD" > A
				$ hg commit -m "Merged"
				abort: unresolved merge conflicts (see "hg help resolve")
				[255]

				Mark the conflict as resolved and commit

				$ hg resolve -m A
				(no more unresolved files)
				$ hg commit -m "Merged"

				$ cd ..