Comment #2 on issue 7536 by bugdro...@chromium.org: Strip CRLFs more
completely from merged WebKit files
http://code.google.com/p/chromium/issues/detail?id=7536
The following revision refers to this bug:
http://src.chromium.org/viewvc/chrome?view=rev&revision=9650
------------------------------------------------------------------------
r9650 | p...@google.com | 2009-02-12 05:36:19 -0800 (Thu, 12 Feb 2009) | 10
lines
Changed paths:
M
http://src.chromium.org/viewvc/chrome/trunk/src/webkit/tools/merge/diff3-wrapper.py?r1=9650&r2=9649
M
http://src.chromium.org/viewvc/chrome/trunk/src/webkit/tools/merge/merge.py?r1=9650&r2=9649
On Windows, find all modified files after a WebKit merge and force them
to LF. 'svn merge' saves them with CRLF otherwise, which interferes with
later merges.
Remove the now-obsolete code that did the same thing after a 3-way merge,
which only took effect when a file had conflicts.
BUG=7536
TEST=run a merge, see no CRLF in text files
Review URL: http://codereview.chromium.org/20289
------------------------------------------------------------------------
--
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
-~----------~----~----~----~------~----~------~--~---
