Erik de Castro Lopo wrote: >> Does the patch work for linux git? Windows git cannot apply a patch >> that was created itself. > > It looks like that patch was created with the 'git diff' command and hence > cannot be applied using the 'git am' command. It does however apply using > the patch command.
To test the patch file I did the following: git diff master > file.patch git checkout master git branch test git checkout test git apply < file.patch And I see: error: patch failed: src/libFLAC/libFLAC_dynamic.vcproj:268 error: src/libFLAC/libFLAC_dynamic.vcproj: patch does not apply error: patch failed: src/libFLAC/libFLAC_static.vcproj:243 error: src/libFLAC/libFLAC_static.vcproj: patch does not apply Maybe it's a minor glitch in Windows version if Git. It seems that it automatically converts LF to CRLF in text files during clone/pull, but .vcproj files already use CRLF as line endings, and this somehow results in this problem. > Have these patches that I apply look correct when you update your FLAC tree? Yes. _______________________________________________ flac-dev mailing list flac-dev@xiph.org http://lists.xiph.org/mailman/listinfo/flac-dev
