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

r13956:ffb5c09b default


                r16193:b468cea3

stable

Download file

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

        Martin Geisler
    
tests: remove redundant mkdir...

              r13956
            
        $ hg init t

        Pradeepkumar Gayam
    
tests: unify test-merge2

              r11976
            
        $ cd t

        $ 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-merge2

              r11976
            
        $ 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-merge2

              r11976
            
        $ rm b

        $ hg update 0

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

        $ echo This is file b2 > b

        $ hg add b

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

              r12156
            
        $ hg commit -m "commit #2"

        Pradeepkumar Gayam
    
tests: unify test-merge2

              r11976
            
        created new head

        $ cd ..; rm -r t

        $ mkdir t

        $ cd t

        $ 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-merge2

              r11976
            
        $ 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-merge2

              r11976
            
        $ rm b

        $ hg update 0

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

        $ echo This is file b2 > b

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

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

        Pradeepkumar Gayam
    
tests: unify test-merge2

              r11976
            
        adding b

        created new head

        $ cd ..; rm -r t

        Martin Geisler
    
tests: remove redundant mkdir...

              r13956
            
        $ hg init t

        Pradeepkumar Gayam
    
tests: unify test-merge2

              r11976
            
        $ cd t

        $ 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-merge2

              r11976
            
        $ 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-merge2

              r11976
            
        $ rm b

        $ hg remove b

        $ hg update 0

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

        $ echo This is file b2 > b

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

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

        Pradeepkumar Gayam
    
tests: unify test-merge2

              r11976
            
        adding b

        created new head

	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

Martin Geisler tests: remove redundant mkdir...	r13956	$ hg init t
Pradeepkumar Gayam tests: unify test-merge2	r11976	$ cd t
		$ 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-merge2	r11976	$ 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-merge2	r11976	$ rm b
		$ hg update 0
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ echo This is file b2 > b
		$ hg add b
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit #2"
Pradeepkumar Gayam tests: unify test-merge2	r11976	created new head
		$ cd ..; rm -r t

		$ mkdir t
		$ cd t
		$ 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-merge2	r11976	$ 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-merge2	r11976	$ rm b
		$ hg update 0
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ echo This is file b2 > b
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -A -m "commit #2"
Pradeepkumar Gayam tests: unify test-merge2	r11976	adding b
		created new head
		$ cd ..; rm -r t

Martin Geisler tests: remove redundant mkdir...	r13956	$ hg init t
Pradeepkumar Gayam tests: unify test-merge2	r11976	$ cd t
		$ 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-merge2	r11976	$ 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-merge2	r11976	$ rm b
		$ hg remove b
		$ hg update 0
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ echo This is file b2 > b
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -A -m "commit #2"
Pradeepkumar Gayam tests: unify test-merge2	r11976	adding b
		created new head