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

bugzilla: stop XMLRPC requests from requesting gzipped responses...

bugzilla: stop XMLRPC requests from requesting gzipped responses Python 2.7 introduced support for gzip encoding in xmlrpclib.Transport. We do our own handling of responses, and don't currently support gzip encoding. So to run successfully under Python 2.7 with a web server configured to gzip encode, stop XMLRPC requests from announcing gzip encoding support.

Martin Geisler - - Load All Authors

File last commit:

r12156:4c94b6d0 default


                r16193:b468cea3

stable

Download file

             test-merge4.t
        
                    20 lines
            
             | 527 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge4.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pradeepkumar Gayam
    
tests: unify test-merge4

              r11977
            
        $ hg init

        $ echo This is file a1 > a

        $ hg add a

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

              r12156
            
        $ hg commit -m "commit #0"

        Pradeepkumar Gayam
    
tests: unify test-merge4

              r11977
            
        $ echo This is file b1 > b

        $ hg add b

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

              r12156
            
        $ hg commit -m "commit #1"

        Pradeepkumar Gayam
    
tests: unify test-merge4

              r11977
            
        $ hg update 0

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

        $ echo This is file c1 > c

        $ hg add c

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

              r12156
            
        $ hg commit -m "commit #2"

        Pradeepkumar Gayam
    
tests: unify test-merge4

              r11977
            
        created new head

        $ hg merge 1

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

        (branch merge, don't forget to commit)

        $ rm b

        $ echo This is file c22 > c

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

              r12156
            
        $ hg commit -m "commit #3"

        Pradeepkumar Gayam
    
tests: unify test-merge4

              r11977

	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-merge4	r11977	$ hg init
		$ echo This is file a1 > a
		$ hg add a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit #0"
Pradeepkumar Gayam tests: unify test-merge4	r11977	$ echo This is file b1 > b
		$ hg add b
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit #1"
Pradeepkumar Gayam tests: unify test-merge4	r11977	$ hg update 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ echo This is file c1 > c
		$ hg add c
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit #2"
Pradeepkumar Gayam tests: unify test-merge4	r11977	created new head
		$ hg merge 1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ rm b
		$ echo This is file c22 > c
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit #3"
Pradeepkumar Gayam tests: unify test-merge4	r11977