upstream/mercurial-mirror Files · contrib/win32/buildlocal.bat

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

Adrian Buehlmann - - Load All Authors

File last commit:

r13383:70ef5b61 default


                r47539:1099ca17

default

Download file

             buildlocal.bat
        
                    9 lines
            
             | 267 B
            
                | application/x-msdownload
            
             |
                BatchLexer
            
             / contrib / win32 / buildlocal.bat
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      @echo off

      rem Double-click this file to (re)build Mercurial for Windows in place.

      rem Useful for testing and development.

      cd ..\..

      del /Q mercurial\*.pyd

      del /Q mercurial\*.pyc

      rmdir /Q /S mercurial\locale

      python setup.py build_py -c -d . build_ext -i build_mo

      pause

	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

				@echo off
				rem Double-click this file to (re)build Mercurial for Windows in place.
				rem Useful for testing and development.
				cd ..\..
				del /Q mercurial\*.pyd
				del /Q mercurial\*.pyc
				rmdir /Q /S mercurial\locale
				python setup.py build_py -c -d . build_ext -i build_mo
				pause