Bug 9290 – Teach svn-apply and svn-unapply to patch ChangeLogs cleanly

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

[David Kilzer (:ddkilzer)]

I've got a patch to svn-apply and svn-unapply to patch ChangeLog files cleanly.

In a nutshell, it sets the patch(1) fuzz factor to 3 when patching ChangeLog files so that trailing context is ignored and the content of the patch is simply prepended to the file.

This sometimes causes ChangeLog.orig files to be left behind, though, so the updated scripts also make sure to unlink them if they're found.

[David Kilzer (:ddkilzer)]

Created attachment 8676 [details]
Patch v1

Patch v1 modifies svn-apply and svn-unapply to do the following:

- Use --fuzz=3 when applying or unapplying ChangeLog patches.
- Unlink (remove) ChangeLog.orig files if they are created in the process of patching.
- Tested with Bug 9234 (for what it's worth).

[Eric Seidel (no email)]

Comment on attachment 8676 [details]
Patch v1

You might consider only unlinking ChangeLog.orig when it didn't exist before the patch attempt...


+        unlink($fullpath . ".orig") if ($base eq "ChangeLog");

Otherwise the change looks good.

[David Kilzer (:ddkilzer)]

Created attachment 8677 [details]
Patch v2

Changes since Patch v1:

- Added 2006 to copyright years in svn-apply.

- Extracted out applyPatch() method in svn-apply, and unapplyPatch() method in svn-unapply.

- Don't remove ChangeLog.orig if it existed before running either svn-apply or svn-unapply per Comment #2.  (I'm not sure this buys you much since patch(1) will overwrite the contents of ChangeLog.orig if it exists before the patch is applied.)

- Simplify reversing a deletion in svn-unapply by calling "svn revert".  (This issue was found while trying to unapply a real patch from Bug 7281.)

[David Kilzer (:ddkilzer)]

Committed revision 14710.