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

[Alexander Drozdov]

Hi Tobias,

I report it: https://bugreports.qt.io/browse/QTCREATORBUG-14012

One question, I registered at the Qt Bug tracker long time ago, but
when I ask new password by email I don't receive anything. Tracker
migration issues? So I registered as new user.

2015-02-20 2:24 GMT+10:00 Tobias Hunger <tobias.hunger at gmail.com>:
> Hi Alexander,
>
> yes, I think we normalize line endings before passing the diff data on
> to the diff plugin. So this is indeed most likely broken on windows.
>
> Could you please file a bug report and assign it over to me? Thanks!
>
> Best Regards,
> Tobias
>
> On Thu, Feb 19, 2015 at 10: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



-- 
WBR, Alexander Drozdov
http://htrd.su