Hi,

Maybe an RTFM question, but I didn't find an answer.

I receive patches and they are in Unix style end-of-line (Lf) (and this I cannot control).
My local sources are in Windows style (CrLf).

I cannot get patch to apply the patchfile to my sources. I tried the option in patch that ignores whitespace, but it fails.

In the end I converted the patchfile to have Windows end-of-line style, and that worked.

I use patch that comes with fpc 2.6.2RC1.

How to solve this?

Bart

AFAIK, there's no way that that patch.exe can deal with it.

Bart hat am 15. M?rz 2013 um 14:28 geschrieben:

The Linux "patch" is clever enough to auto convert line endings. Maybe the fpc version converts to Linux line ending instead of Windows line endings?

I cannot get patch to apply the patchfile to my sources. I tried the option in patch that ignores whitespace, but it fails.

whitespaces are tabs and spaces, not line endings.

In the end I converted the patchfile to have Windows end-of-line style, and that worked.

Yes, that's the solution.

I use patch that comes with fpc 2.6.2RC1. How to solve this?

Mattias

Reinier Olislagers wrote

AFAIK, there's no way that that patch.exe can deal with it.

OK, I need some Unix2Dos (and possibly Mac2Dos) then.

Bart

Bart wrote

How to solve this?

Getting a newer patch.exe may work.
Using e.g. git's patch may work.

Reinier Olislagers wrote

Getting a newer patch.exe may work. Using e.g. git's patch may work.

Git's patch does work in such case. You can explicitly tell it to ignore EOL styles, but by default it works fine.

Regards,
- Graeme -

15.03.2013 17:28, Bart ?????:

Don't remember these problems with TortoiseSVN patch function.