[Qt-creator] [VCS][Git] Revert chunk does not work

[Orgad Shaneh]

On Thu, Feb 19, 2015 at 11:41 AM, Alexander Drozdov <adrozdoff at gmail.com>
wrote:

> Hi, is it bug, or settings issue:
>
> I use Git and try to revert chunk and got next error:
> ~~~
> Executing in /home/alexd/programming/someprog-git: /usr/bin/patch -p0 -R
> patching file Common/Common.cpp
> Hunk #1 FAILED at 38 (different line endings).
> 1 out of 1 hunk FAILED -- saving rejects to file Common/Common.cpp.rej
>
> "/usr/bin/patch" failed (exit code 1).
> ~~~
>
> I look into Common.cpp.rej and found that it has Unix line ends but
> source file Windows line ends.
>
> Look like DiffChunk::asPatch ignores lines ends in source file.
>
> git/master Qt Creator on linux mint 17.1
>
> --
> WBR, Alexander Drozdov
> http://htrd.su
> _______________________________________________
> Qt-creator mailing list
> Qt-creator at qt-project.org
> http://lists.qt-project.org/mailman/listinfo/qt-creator
>

Hi,

Do you have "Ignore Whitespace" enabled? This is likely to fail revert when
there are WS changes.

- Orgad
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.qt-project.org/pipermail/qt-creator/attachments/20150219/65a8fe64/attachment.html>