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

Alexander Drozdov adrozdoff at gmail.com
Thu Feb 19 10:41:15 CET 2015


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



More information about the Qt-creator mailing list