Tortoise Diff: The file C:\TEMP\Rock_1.sap-rev798.svn001.tmp.sap is not a...
Brought to you by:
pfusik
Menu
▾
▴
#45 Tortoise Diff: The file C:\TEMP\Rock_1.sap-rev798.svn001.tmp.sap is not a valid text file!
I installed perl to learn what the Tools scrips in ASMA do. I ran this:
C:\jac\system\Atari800\Sounds\ASMA\SVN\trunk\tools>fix-brk.bat
C:\jac\system\Atari800\Sounds\ASMA\SVN\trunk\tools>perl -p0777i -e "s/^([^\xFF]+.{5067})L(.{431})L(.+)\xe0\x02\xe1\x02..$/$1\x60$2\x60$3/s||print STDERR qq{$ARGV\n}" ../asma/Unknown/Rock_1.sap
../asma/Unknown/Rock_1.sap
And it looks like it fixed one file. When I try to diff this via the context menu of TortoiseSVN TortoiseSVN 1.14.9, Build 29743 - 64 Bit , 2024/11/29 19:43:55 I get an error popup with
"---------------------------
TortoiseMerge
The file
C:\TEMP\Rock_1.sap-rev798.svn001.tmp.sap
is not a valid text file!
OK
"
Maybe I missing some configuration? I know there was DIFF support... but the Wiki is down...
Additional remark: my "checksap" reported the modified file as corrupted. If think the logic in the script incorrectly matches here.
fix-brk is a quick-and-dirty single-use tool for ASMA. No, I'm not going to maintain or document it. :)
The root cause of your problems is that you installed a wrong perl on Windows, which uses CRLFs instead of LFs. My fix-brk wasn't prepared for that. Having LFs on all systems makes things easier. I use perl from https://www.msys2.org - after the installer is finished, run
pacman -S perl. I use MSYS2 for tools like GCC, GNU Make, Python, Node.js.Now the only problem in ASAP is the poor reporting of broken files in the TortoiseSVN plugin. Let me check what I can do about it.
Please attach the broken
Rock_1.sapfile for tests.The I'd suggest to just remove it from the repo.
See below.
I've removed my previous Perl installation and use MYSYS2 now.
What confuses me is that I now have a bash, but the scripts are ".bat" files?
Last edit: Peter Dell 2026-01-01
I removed fix-brk.bat from the ASMA repo.
I don't reproduce any error message after copying the file you attached over asma/Unknown/Rock_1.sap. See the attached screenshot. What exactly did you do?
MSYS2 perl (and other tools) can be run directly from the Windows command prompt. That's how I usually use it. I rarely use the bash and I never ever use the MSYS2 terminal.
I'm using the same TortoiseSVN version as you and ASAP 7.0.0 on Windows 11 24H2.
Also, is your issue just for malformed files or can't you diff any changes?
I'm concerned that your error message says
C:\TEMP. I don't have this directory on my disk.That's my preference from the 80s. Single user computer, so TEMP is not somewhere in the user profile, but there. Environment variables are set up like this:
TEMP=C:\TEMP
TMP=C:\TEMP
When I trigger the diff, two .sap files are created there. But they are .SAP files, not text files,
Strange. Are the .SAP files in C:\TEMP identical to the source files?