Bug 21850 – svn-apply and svn-unapply should preserve patch line endings

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[David Kilzer (:ddkilzer)]

* 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.

[David Kilzer (:ddkilzer)]

Created attachment 24634 [details]
Patch v1

Proposed fix.

[Adam Roben (:aroben)]

Comment on attachment 24634 [details]
Patch v1

r=me

[David Kilzer (:ddkilzer)]

$ 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]

Reopening to attach new patch.

[Rob Buis]

Created attachment 413543 [details]
Patch

[Rob Buis]

Uploaded to wrong bug...

[Radar WebKit Bug Importer]

<rdar://problem/71856103>