Status: Assigned Owner: p...@chromium.org CC: dglaz...@chromium.org, dim...@chromium.org, o...@chromium.org, da...@chromium.org, esei...@chromium.org Labels: Type-Bug Pri-2 OS-All Area-Misc
New issue 7536 by p...@chromium.org: Strip CRLFs more completely from merged WebKit files http://code.google.com/p/chromium/issues/detail?id=7536 During a WebKit merge, a file that is merged but has no conflicts ends up with CRLFs if the merger is using kdiff3 (maybe BeyondCompare too). When svn calls kdiff3, it's actually calling a wrapper script (or two, depending on your OS). While we wait for svn:eol-style to be applied upstream -- or even after it is, in case some files slip through there -- it should be pretty easy to move the force-LF code from merge.py out into the wrapper script, so it gets applied whether or not there are conflicts to resolve. This is in addition to setting svn:eol-style=LF on WebKit files, which is https://bugs.webkit.org/show_bug.cgi?id=23631 . Belt and suspenders. -- You received this message because you are listed in the owner or CC fields of this issue, or because you starred this issue. You may adjust your issue notification preferences at: http://code.google.com/hosting/settings --~--~---------~--~----~------------~-------~--~----~ Automated mail from issue updates at http://crbug.com/ Subscription options: http://groups.google.com/group/chromium-bugs -~----------~----~----~----~------~----~------~--~---
