[ofw] [PATCH] Cleanup XXX_PTR64 macros from tests
Fab Tillier
ftillier at windows.microsoft.com
Mon Jun 30 12:32:25 PDT 2008
>>> Tried to apply the patch and get conflict in cmtest.c
>>
>> Looks like changes in line endings...
>
> It also appears that I screwed up generating the patch... Ignore this
> last one, I'll resend (yet again)...
>
> I'll eventually get the hang of it...
Ok, so I'm having a hard time with diff/patch and SVN... Actually, I think it's just SVN.
I've updated to the latest version of patch from the gnuwin32 sourceforge project, version 2.5.9.2670.
I cannot apply patches generated by SVN if my changes touch a file with non-Windows line endings. I tried 'svn diff' as well as 'svn diff -x --ignore-eol-style'. So rather than manually changing the line endings of the diff file, I will change culprit files to consistent, Windows line ending, check that in, and then resend my patches...
-Fab
More information about the ofw
mailing list