Bug 156618 - svn-apply: add option for ignoring changes to ChangeLog files
Summary: svn-apply: add option for ignoring changes to ChangeLog files
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Dana Burkart
Keywords: InRadar
Depends on:
Reported: 2016-04-14 21:46 PDT by Dana Burkart
Modified: 2016-04-18 10:13 PDT (History)
3 users (show)

See Also:

patch (1.97 KB, patch)
2016-04-15 16:08 PDT, Dana Burkart
darin: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Dana Burkart 2016-04-14 21:46:05 PDT
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  <johndoe@webkit.org>
+        Enhance interface foo with bar.
+        Reviewed By: NOBODY (OOPS).
+        This change does something
+2016-04-14  John Doe  <johndoe@webkit.org>

         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.
Comment 1 Dana Burkart 2016-04-14 21:46:41 PDT
Comment 2 Dana Burkart 2016-04-15 16:08:13 PDT
Created attachment 276519 [details]

Adds an option to svn-apply to not apply changes to ChangeLog files.
Comment 3 Darin Adler 2016-04-16 10:42:51 PDT
Comment on attachment 276519 [details]

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?
Comment 4 Dana Burkart 2016-04-18 10:13:22 PDT
Committed r199674.