upstream/mercurial-mirror Files · tests/test-merge10.t

httprepo: long arguments support (issue2126)...

httprepo: long arguments support (issue2126) Send the command arguments in the HTTP headers. The command is still part of the URL. If the server does not have the 'httpheader' capability, the client will send the command arguments in the URL as it did previously. Web servers typically allow more data to be placed within the headers than in the URL, so this approach will: - Avoid HTTP errors due to using a URL that is too large. - Allow Mercurial to implement a more efficient wire protocol. An alternate approach is to send the arguments as part of the request body. This approach has been rejected because it requires the use of POST requests, so it would break any existing configuration that relies on the request type for authentication or caching. Extensibility: - The header size is provided by the server, which makes it possible to introduce an hgrc setting for it. - The client ignores the capability value after the first comma, which allows more information to be included in the future.

Martin Geisler - - Load All Authors

File last commit:

r12156:4c94b6d0 default


                r14093:ce99d887

default

Download file

             test-merge10.t
        
                    51 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge10.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pradeepkumar Gayam
    
tests: unify test-merge10

              r11983
            
      Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb

      (merge correctly when all the files in a directory are moved

      but then local changes are added in the same directory)

        $ hg init a

        $ cd a

        $ mkdir -p testdir

        $ echo a > testdir/a

        $ hg add testdir/a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m a

        Pradeepkumar Gayam
    
tests: unify test-merge10

              r11983
            
        $ cd ..

        $ hg clone a b

        updating to branch default

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

        $ cd a

        $ echo alpha > testdir/a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m remote-change

        Pradeepkumar Gayam
    
tests: unify test-merge10

              r11983
            
        $ cd ..

        $ cd b

        $ mkdir testdir/subdir

        $ hg mv testdir/a testdir/subdir/a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m move

        Pradeepkumar Gayam
    
tests: unify test-merge10

              r11983
            
        $ mkdir newdir

        $ echo beta > newdir/beta

        $ hg add newdir/beta

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m local-addition

        Pradeepkumar Gayam
    
tests: unify test-merge10

              r11983
            
        $ hg pull ../a

        pulling from ../a

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg up -C 2

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

        $ hg merge

        merging testdir/subdir/a and testdir/a to testdir/subdir/a

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

        (branch merge, don't forget to commit)

        $ hg stat

        M testdir/subdir/a

        $ hg diff --nodates

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        diff -r bc21c9773bfa testdir/subdir/a

        Pradeepkumar Gayam
    
tests: unify test-merge10

              r11983
            
        --- a/testdir/subdir/a

        +++ b/testdir/subdir/a

        @@ -1,1 +1,1 @@

        -a

        +alpha

	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

Pradeepkumar Gayam tests: unify test-merge10	r11983	Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb
		(merge correctly when all the files in a directory are moved
		but then local changes are added in the same directory)

		$ hg init a
		$ cd a
		$ mkdir -p testdir
		$ echo a > testdir/a
		$ hg add testdir/a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m a
Pradeepkumar Gayam tests: unify test-merge10	r11983	$ cd ..

		$ hg clone a b
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd a
		$ echo alpha > testdir/a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m remote-change
Pradeepkumar Gayam tests: unify test-merge10	r11983	$ cd ..

		$ cd b
		$ mkdir testdir/subdir
		$ hg mv testdir/a testdir/subdir/a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m move
Pradeepkumar Gayam tests: unify test-merge10	r11983	$ mkdir newdir
		$ echo beta > newdir/beta
		$ hg add newdir/beta
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m local-addition
Pradeepkumar Gayam tests: unify test-merge10	r11983	$ hg pull ../a
		pulling from ../a
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
		(run 'hg heads' to see heads, 'hg merge' to merge)
		$ hg up -C 2
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg merge
		merging testdir/subdir/a and testdir/a to testdir/subdir/a
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg stat
		M testdir/subdir/a
		$ hg diff --nodates
Martin Geisler tests: remove unneeded -d flags...	r12156	diff -r bc21c9773bfa testdir/subdir/a
Pradeepkumar Gayam tests: unify test-merge10	r11983	--- a/testdir/subdir/a
		+++ b/testdir/subdir/a
		@@ -1,1 +1,1 @@
		-a
		+alpha