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

context: override workingctx.hex() to avoid a crash...

context: override workingctx.hex() to avoid a crash Since node is None for workingctx, it can't use the base class implementation of 'hex(self.node())'. It doesn't appear that there are any current callers of this, but there will be when archive supports 'wdir()'. My first thought was to use "{p1node}+", but that would cause headaches elsewhere [1]. We should probably fix up localrepository.__getitem__ to accept this hash for consistency, as a followup. This works, if the full hash is specified: @@ -480,7 +480,7 @@ return dirstate.dirstate(self.vfs, self.ui, self.root, validate) def __getitem__(self, changeid): - if changeid is None: + if changeid is None or changeid == 'ff' * 20: return context.workingctx(self) if isinstance(changeid, slice): return [context.changectx(self, i) That differs from null, where it will accept any number of 0s, as long as it isn't ambiguous. [1] https://www.selenic.com/pipermail/mercurial-devel/2015-June/071166.html

Patrick Mezard - - Load All Authors

File last commit:

r16536:63c817ea stable


                r25590:183965a0

default

Download file

             test-merge4.t
        
                    25 lines
            
             | 654 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

        Patrick Mezard
    
commit: abort on merge with missing files...

              r16536
            
      Test hg behaves when committing with a missing file added by a merge

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

              r12156
            
        $ hg commit -m "commit #3"

        Patrick Mezard
    
commit: abort on merge with missing files...

              r16536
            
        abort: cannot commit merge with missing files

        [255]

        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
Patrick Mezard commit: abort on merge with missing files...	r16536
		Test hg behaves when committing with a missing file added by a merge

Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit #3"
Patrick Mezard commit: abort on merge with missing files...	r16536	abort: cannot commit merge with missing files
		[255]
Pradeepkumar Gayam tests: unify test-merge4	r11977