upstream/mercurial-mirror Files · tests/test-merge5.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.

Martin von Zweigbergk - - Load All Authors

File last commit:

r23026:fe80fdf6 default


                r26756:9e272a96

default

Download file

             test-merge5.t
        
                    40 lines
            
             | 928 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge5.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo This is file a1 > a

        $ echo This is file b1 > b

        $ hg add a b

        $ hg commit -m "commit #0"

        $ echo This is file b22 > b

        $ hg commit -m "comment #1"

        $ hg update 0

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

        $ rm b

        $ hg commit -A -m "comment #2"

        removing b

        created new head

        $ hg update 1

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

        $ hg update

        abort: not a linear update

        (merge or update --check to force update)

        [255]

        $ rm b

        $ hg update -c

        abort: uncommitted changes

        [255]

        $ hg revert b

        $ hg update -c

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

        $ mv a c

      Should abort:

        $ hg update 1

        abort: uncommitted changes

        (commit or update --clean to discard changes)

        [255]

        $ mv c a

      Should succeed:

        $ hg update 1

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

	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

				$ hg init
				$ echo This is file a1 > a
				$ echo This is file b1 > b
				$ hg add a b
				$ hg commit -m "commit #0"
				$ echo This is file b22 > b
				$ hg commit -m "comment #1"
				$ hg update 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm b
				$ hg commit -A -m "comment #2"
				removing b
				created new head
				$ hg update 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg update
				abort: not a linear update
				(merge or update --check to force update)
				[255]
				$ rm b
				$ hg update -c
				abort: uncommitted changes
				[255]
				$ hg revert b
				$ hg update -c
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mv a c

				Should abort:

				$ hg update 1
				abort: uncommitted changes
				(commit or update --clean to discard changes)
				[255]
				$ mv c a

				Should succeed:

				$ hg update 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved