Bug 21850

Summary:

svn-apply and svn-unapply should preserve patch line endings

Product:

WebKit

Reporter:

David Kilzer (:ddkilzer) <ddkilzer>

Component:

Tools / Tests

Assignee:

David Kilzer (:ddkilzer) <ddkilzer>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

aroben, darin, mrowe, rbuis, webkit-bug-importer

Priority:

Keywords:

InRadar

Version:

528+ (Nightly build)

Hardware:

Mac

OS:

OS X 10.5

Attachments:

Description	Flags
Patch v1	none
Patch	none

David Kilzer (:ddkilzer)

Reported 2008-10-23 21:41:53 PDT

* SUMMARY When applying (or unapplying) a patch, svn-apply and svn-unapply will remove all "native" line endings from a patch, and replace then with "\n". This causes problems when a patch contains more than one type of line ending (such as changes to a *.vcproj file and a *.pbxproj file in the same patch). * STEPS TO REPRODUCE 0. On a Mac OS X system. 1. Make changes to *.pbxproj and *.vcproj files. 2. Use svn-create-patch to create a patch of the changes. 3. Use svn-unapply to revert the changes using the patch file. 3a. Alternatively, use svn revert to back out the changes, then use svn-apply with the patch file. * RESULTS The svn-unapply or svn-apply operation will fail because the "native" line endings in the patch are currently stripped by the scripts. * NOTES Instead, both scripts should preserve the line endings for each patch, since the patch(1) command knows how to deal with them anyway.

Attachments
Patch v1 (1.90 KB, patch) 2008-10-23 21:58 PDT, David Kilzer (:ddkilzer)	no flags	Details Formatted Diff Diff
Patch (1.88 KB, patch) 2020-11-08 11:04 PST, Rob Buis	no flags	Details Formatted Diff Diff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.

David Kilzer (:ddkilzer)

Comment 1 2008-10-23 21:58:25 PDT

Created attachment 24634 [details] Patch v1 Proposed fix.

Adam Roben (:aroben)

Comment 2 2008-10-24 07:30:53 PDT

Comment on attachment 24634 [details] Patch v1 r=me

David Kilzer (:ddkilzer)

Comment 3 2008-10-24 11:20:16 PDT

$ svn commit WebKitTools Sending WebKitTools/ChangeLog Sending WebKitTools/Scripts/svn-apply Sending WebKitTools/Scripts/svn-unapply Transmitting file data ... Committed revision 37847. http://trac.webkit.org/changeset/37847

Rob Buis

Comment 4 2020-11-08 11:04:54 PST

Reopening to attach new patch.

Rob Buis

Comment 5 2020-11-08 11:04:57 PST

Created attachment 413543 [details] Patch

Rob Buis

Comment 6 2020-11-08 11:29:18 PST

Uploaded to wrong bug...

Radar WebKit Bug Importer

Comment 7 2020-12-01 10:21:20 PST

<rdar://problem/71856103>

Note You need to log in before you can comment on or make changes to this bug.