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

py3: implement __bytes__ for committablectx...

py3: implement __bytes__ for committablectx Before this method, calling bytes on workingctx or memctx calls basectx.__bytes__ since the magic method was not defined for this class. When it calls the method from basectx class, it returns TypeError because None is passed into it. After this commit `hg update -C` works on Python 3 if eol is not enabled.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r32643:1df98fc9

default

Download file

             test-merge2.t
        
                    53 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

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

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

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
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..