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

merge: do the trivial resolution after updating sparse checkout...

merge: do the trivial resolution after updating sparse checkout In merge, we do trivial resolution for files which were deleted on one side and changed on other. When sparse extension in involved that file might not be present in wdir and trivial resolution can lead to file not found error. This patch make sure we updates the sparse checkout before doing the trivial resolution. This fixes the test failure demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D3984

FUJIWARA Katsunori - - Load All Authors

File last commit:

r23934:975c4fc4 stable


                r39017:d49e490a

@94 stable

Download file

             hg.bat
        
                    19 lines
            
             | 475 B
            
                | application/x-msdownload
            
             |
                BatchLexer
            
             / contrib / win32 / hg.bat
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      @echo off

      rem Windows Driver script for Mercurial

      setlocal

      set HG=%~f0

      rem Use a full path to Python (relative to this script) if it exists,

      rem as the standard Python install does not put python.exe on the PATH...

      rem Otherwise, expect that python.exe can be found on the PATH.

      rem %~dp0 is the directory of this script

      if exist "%~dp0..\python.exe" (

          "%~dp0..\python" "%~dp0hg" %*

      ) else (

          python "%~dp0hg" %*

      )

      endlocal

      exit /b %ERRORLEVEL%

	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 Windows Driver script for Mercurial

				setlocal
				set HG=%~f0

				rem Use a full path to Python (relative to this script) if it exists,
				rem as the standard Python install does not put python.exe on the PATH...
				rem Otherwise, expect that python.exe can be found on the PATH.
				rem %~dp0 is the directory of this script

				if exist "%~dp0..\python.exe" (
				"%~dp0..\python" "%~dp0hg" %*
				) else (
				python "%~dp0hg" %*
				)
				endlocal

				exit /b %ERRORLEVEL%