<html><body><div style="color:#000; background-color:#fff; font-family:times new roman, new york, times, serif;font-size:12pt"><span class="tab"> <br></span><div style="color: rgb(0, 0, 0); font-size: 16px; font-family: times new roman,new york,times,serif; background-color: transparent; font-style: normal;"><span class="tab"> Unfortunately, that did not work. The problem was that </span>these KDE policies do not check just HEAD but all commits in line so the offending commit still caused trouble. I found which one it was: "get rid of compiler warnings about mstackrealign in visual studio". If you look at your diff for this commit, you'll see that every file had only the region around "# Realign the stack..." changed - with the exception of qyoto-phonon/native/CMakeLists.txt, which had almost all of its new lines changed. I had to manually reapply your changes from this commit and above and create new commits to make
this work. This means that you may have some conflicts to resolve when you merge to your dev branch.<br><span class="tab"> Anyway, while this was not pleasant, I really appreciate your work, please keep up. :)</span></div><div style="color: rgb(0, 0, 0); font-size: 16px; font-family: times new roman,new york,times,serif; background-color: transparent; font-style: normal;"><br><span class="tab"></span></div><div style="color: rgb(0, 0, 0); font-size: 16px; font-family: times new roman,new york,times,serif; background-color: transparent; font-style: normal;"><span class="tab"> Regards,</span></div><div style="color: rgb(0, 0, 0); font-size: 16px; font-family: times new roman,new york,times,serif; background-color: transparent; font-style: normal;"><span class="tab"> Dimitar</span><span class="tab"><br></span></div><div><br></div> <div style="font-family: times new roman, new york, times, serif;
font-size: 12pt;"> <div style="font-family: times new roman, new york, times, serif; font-size: 12pt;"> <div dir="ltr"> <font face="Arial" size="2"> <hr size="1"> <b><span style="font-weight:bold;">From:</span></b> David Lechner <david@lechnology.com><br> <b><span style="font-weight: bold;">To:</span></b> kde-bindings@kde.org <br> <b><span style="font-weight: bold;">Sent:</span></b> Sunday, March 3, 2013 11:14 PM<br> <b><span style="font-weight: bold;">Subject:</span></b> Re: [Kde-bindings] [Qyoto] New Build Instructions for Linux, Windows MinGW and Windows Visual Studio<br> </font> </div> <br>
On 3/3/2013 9:15 AM, Dimitar Dobrev wrote:<br>> <br>> This works, thanks. However, now I get an error trying to push the<br>> last commit:<br>> <br>> remote: Audit failure - Commit 8e56f67f29dee0c30e620d7d1c55faac8c06723e<br>> - This file contains wrong line endings, it needs to be linux line<br>> endings ( you can look at dos2unix if needed ) :<br>> assemblies/qyoto-phonon/native/CMakeLists.txt<br>> remote: Push declined - commits failed audit<br>> remote: error: hook declined to update refs/heads/master<br>> To <a ymailto="mailto:git@git.kde.org" href="mailto:git@git.kde.org">git@git.kde.org</a>:assemblygen<br>> ! [remote rejected] master -> master (hook declined)<br>> error: failed to push some refs to '<a ymailto="mailto:git@git.kde.org" href="mailto:git@git.kde.org">git@git.kde.org</a>:assemblygen'<br>> <br>> I push from Windows and I use Git's automatic
conversion from LF to<br>> CRLF. So qyoto-phonon/native/CMakeLists.txt should've appeared to me<br>> with CRLF but when I open it I can see it uses LF. All other<br>> native/CMakeLists.txt appear with CRLF. Could you please check this as well?<br><br>I think you make have said this backward. The error message says that everything should be linux line endings (LF). Looking at all my files, they are LF only - except for one line in assemblies/qyoto-phonon/native/CMakeLists.txt, which I have fixed: <a href="https://github.com/dlech/assemblygen/commit/ff02487b4aedf38c95e0246f608f98cf773fda7b" target="_blank">https://github.com/dlech/assemblygen/commit/ff02487b4aedf38c95e0246f608f98cf773fda7b</a><br><br>I'll be sure to change the settings on my local repo to keep this from happening in the future.<br><br>So, cross your fingers. Hope we got it this time :)<br><br><br>_______________________________________________<br>Kde-bindings mailing list<br><a
ymailto="mailto:Kde-bindings@kde.org" href="mailto:Kde-bindings@kde.org">Kde-bindings@kde.org</a><br><a href="https://mail.kde.org/mailman/listinfo/kde-bindings" target="_blank">https://mail.kde.org/mailman/listinfo/kde-bindings</a><br><br><br> </div> </div> </div></body></html>