Mercurial > hg
annotate contrib/win32/buildlocal.bat @ 46815:433cef8f3104
copies: distinguish between merged and touched files during upgrade
This a filenode being different between p1, p2 and result does not necessarily
means a merges happens. For example p2 could be a strict newer version of p1, so
the p2 version is picked by the manifest merging, but then the file is manually
updated before the commit.
In this case the file should be detected as touched.
Differential Revision: https://phab.mercurial-scm.org/D10220
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 13 Mar 2021 03:17:00 +0100 |
parents | 70ef5b610222 |
children |
rev | line source |
---|---|
13383
70ef5b610222
contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
1 @echo off |
70ef5b610222
contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
2 rem Double-click this file to (re)build Mercurial for Windows in place. |
70ef5b610222
contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
3 rem Useful for testing and development. |
70ef5b610222
contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
4 cd ..\.. |
70ef5b610222
contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
5 del /Q mercurial\*.pyd |
70ef5b610222
contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
6 del /Q mercurial\*.pyc |
70ef5b610222
contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
7 rmdir /Q /S mercurial\locale |
70ef5b610222
contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
8 python setup.py build_py -c -d . build_ext -i build_mo |
70ef5b610222
contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
9 pause |