upstream/mercurial-mirror Files · tests/test-merge5.out

don't return uninitialized memory from bdiff.blocks()...

don't return uninitialized memory from bdiff.blocks() bdiff.blocks() returns a dummy match at the end of both files; the length of that chunk is never set, so it will sometimes contain random heap garbage. There are apparently workarounds for this elsewhere: # bdiff sometimes gives huge matches past eof, this check eats them,

Benoit Boissinot - - Load All Authors

File last commit:

r3592:fffc8a73 default


                r4131:1ca664c9

default

Download file

             test-merge5.out
        
                    3 lines
            
             | 159 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge5.out

History | Annotation | Raw |Copy content |Copy permalink

				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				removing b
				abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes

	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