Mercurial > hg
annotate contrib/win32/hg.bat @ 39224:5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
I think this is related to the octopus merge being sloppy, and that's having a
cascading affect on the fixup merge. If this change is made on p1 (specifically
with the 'Added parent file' commit), the failure doesn't occur.
The file modification with the rename doesn't seem to be necessary, but it's
what's happening in a production repo where I first noticed, so I left it. This
is an example of the manifest divergence I'd been seeing, which wasn't fixed by
Yuya's recent changes. This is separate from the changelog divergence I was
also seeing[1]. Probably nobody cares about bzr anymore, but this will also
affect git, since the octopus fixup code is in the hg sink.
[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-August/120473.html
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 20 Aug 2018 16:19:36 -0400 |
parents | 975c4fc4a512 |
children | fc8a5c9ecee0 |
rev | line source |
---|---|
6513
66e87c11447d
Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff
changeset
|
1 @echo off |
66e87c11447d
Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff
changeset
|
2 rem Windows Driver script for Mercurial |
66e87c11447d
Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff
changeset
|
3 |
66e87c11447d
Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff
changeset
|
4 setlocal |
66e87c11447d
Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff
changeset
|
5 set HG=%~f0 |
66e87c11447d
Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff
changeset
|
6 |
19091
f01a351db791
win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
12653
diff
changeset
|
7 rem Use a full path to Python (relative to this script) if it exists, |
f01a351db791
win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
12653
diff
changeset
|
8 rem as the standard Python install does not put python.exe on the PATH... |
f01a351db791
win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
12653
diff
changeset
|
9 rem Otherwise, expect that python.exe can be found on the PATH. |
6513
66e87c11447d
Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff
changeset
|
10 rem %~dp0 is the directory of this script |
66e87c11447d
Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff
changeset
|
11 |
19091
f01a351db791
win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
12653
diff
changeset
|
12 if exist "%~dp0..\python.exe" ( |
f01a351db791
win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
12653
diff
changeset
|
13 "%~dp0..\python" "%~dp0hg" %* |
f01a351db791
win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
12653
diff
changeset
|
14 ) else ( |
f01a351db791
win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
12653
diff
changeset
|
15 python "%~dp0hg" %* |
f01a351db791
win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
12653
diff
changeset
|
16 ) |
6513
66e87c11447d
Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff
changeset
|
17 endlocal |
23934
975c4fc4a512
hg.bat: return exit code explicitly for indirect invocation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19091
diff
changeset
|
18 |
975c4fc4a512
hg.bat: return exit code explicitly for indirect invocation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19091
diff
changeset
|
19 exit /b %ERRORLEVEL% |