В общем взрыв мозга, нагемороился я с diff patch вдоволь.
Проблема в следующем, diff версии 3.2 под винду в +++ и ---- ставит следующие:
[CR] - \n
[LF] - \r
Цитата |
--- ./head.php[LF] +++ ./head.php[LF] |
Цитата |
--- ./head.php[CR][LF] +++ ./head.php[CR][LF] |
Цитата |
--binary Read and write all files in binary mode, except for standard output and /dev/tty. This option has no effect on POSIX-conforming systems. On systems like DOS where this option makes a difference, the patch should be generated by diff -a --binary. |
diff -uadw original/head.php patched/head.php
diff -uadw original/head.php patched/head.php > head.patch
patch -u --verbose -i head.patch
patch -u --verbose -i head.patch
patch -u --binary --verbose -i head.patch