Bug 156618 – svn-apply: add option for ignoring changes to ChangeLog files

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Dana Burkart]

It would be nice if svn-apply had an option to skip all changes to ChangeLog files, for use
when not planning to commit after application. The specific case I am thinking of that this
would help with is the following scenario:

- The user is using git-svn (not sure if this happens with pure SVN)
- There are two ChangeLog entries in a row with the same header
- The user neglected to `git-svn rebase` or `svn up` before generating the patch

In this case, git will generate a patch that looks something like this:

2016-04-14  John Doe  <[e-mail]>
+
+        Enhance interface foo with bar.
+
+        Reviewed By: NOBODY (OOPS).
+
+        This change does something
+
[phone]  John Doe  <[e-mail]>

         Some other change that happens to be by John Doe.


The behavior of svn-apply, which is to attempt to patch the ChangeLog with `patch --fuzz=3`,
will not be sufficient, since a fuzz value of 3 will not work with this patch if HEAD has a 
completely different ChangeLog entry at the top.

[Dana Burkart]

<rdar://problem/25737270>

[Dana Burkart]

Created attachment 276519 [details]
patch

Adds an option to svn-apply to not apply changes to ChangeLog files.

[Darin Adler]

Comment on attachment 276519 [details]
patch

Seems OK. I would have put this logic inside the existing ChangeLog section below, but I suppose that would have missed deleted and added change logs. But how common are those?

[Dana Burkart]

Committed r199674.
http://trac.webkit.org/changeset/199674