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

merge: consider the file merged when using :merge-{local,other}...

merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999

Adrian Buehlmann - - Load All Authors

File last commit:

r13383:70ef5b61 default


                r49415:50de0890

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