Op 26-5-2013 8:53, Liviu Andronic schreef:
Hello Richard,
On Sun, May 26, 2013 at 12:24 AM, Richard Heck <rgh...@lyx.org> wrote:
These are just whitespace issues. I've fixed them in the attached, which are
also rebased to current trunk.
I made some partial progress. I managed to apply the first patch only
after I stripped trailing spaces from the patch _and_ changed
line-endings from CRLF (Win) to LF (Unix). I guess it's a GIT-related
Windows-Linux incompatibility.
git apply "0001-Liviu-s-chunk-patch.patch" (15337)
git apply "0001-Liviu-s-chunk-patch.patch" (15337) returned '0'
However I'm still stumbling on the second, even after the
post-processing above:
git apply "0002-A-start-on-lyx2lyx-for-chunks.patch" (15371)
error: patch failed: lib/lyx2lyx/lyx_2_1.py:4152
error: lib/lyx2lyx/lyx_2_1.py: patch does not apply
error: patch failed: src/version.h:30
error: src/version.h: patch does not apply
git apply "0002-A-start-on-lyx2lyx-for-chunks.patch" (15371) returned '1'
I had the same error in the first try. After correcting the eol-style of
the patch file, everything was ok again. To correct the eol-style I used
'dos2unix' in a Git bash shell.
Vincent
