upstream/mercurial-mirror Files · hgext/largefiles/CONTRIBUTORS

mergestate: don't pop stateextras when there are no conflicts on filemerge...

mergestate: don't pop stateextras when there are no conflicts on filemerge Even if `filemerge.filemerge()` didn't result in conflicts, we should not remove stateextras for a file since we now use that for more things than just merge time information. We use stateextras to store information which is required to be used by commit. I tracked this down while finding why a patch of mine which adds more commit related information does not work as expected and looses the extras in mergestate. Differential Revision: https://phab.mercurial-scm.org/D10148

various - - Load All Authors

File last commit:

r15168:cfccd3be default


                r47539:1099ca17

default

Download file

             CONTRIBUTORS
        
                    4 lines
            
             | 172 B
            
                | text/plain
            
             |
                TextLexer

/ hgext / largefiles / CONTRIBUTORS

History | Source | Raw |Copy content |Copy permalink

various hgext: add largefiles extension...	r15168	Greg Ward, author of the original bfiles extension
		Na'Tosha Bard of Unity Technologies
		Fog Creek Software
		Special thanks to the University of Toronto and the UCOSP program

	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