<html>
<head>
<base href="https://bugs.webkit.org/" />
</head>
<body><table border="1" cellspacing="0" cellpadding="8">
<tr>
<th>Bug ID</th>
<td><a class="bz_bug_link
bz_status_NEW "
title="NEW - svn-apply: add option for ignoring changes to ChangeLog files"
href="https://bugs.webkit.org/show_bug.cgi?id=156618">156618</a>
</td>
</tr>
<tr>
<th>Summary</th>
<td>svn-apply: add option for ignoring changes to ChangeLog files
</td>
</tr>
<tr>
<th>Classification</th>
<td>Unclassified
</td>
</tr>
<tr>
<th>Product</th>
<td>WebKit
</td>
</tr>
<tr>
<th>Version</th>
<td>WebKit Nightly Build
</td>
</tr>
<tr>
<th>Hardware</th>
<td>Unspecified
</td>
</tr>
<tr>
<th>OS</th>
<td>Unspecified
</td>
</tr>
<tr>
<th>Status</th>
<td>NEW
</td>
</tr>
<tr>
<th>Severity</th>
<td>Normal
</td>
</tr>
<tr>
<th>Priority</th>
<td>P2
</td>
</tr>
<tr>
<th>Component</th>
<td>Tools / Tests
</td>
</tr>
<tr>
<th>Assignee</th>
<td>webkit-unassigned@lists.webkit.org
</td>
</tr>
<tr>
<th>Reporter</th>
<td>dburkart@apple.com
</td>
</tr>
<tr>
<th>CC</th>
<td>lforschler@apple.com
</td>
</tr></table>
<p>
<div>
<pre>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 <<a href="mailto:johndoe@webkit.org">johndoe@webkit.org</a>>
+
+ Enhance interface foo with bar.
+
+ Reviewed By: NOBODY (OOPS).
+
+ This change does something
+
+2016-04-14 John Doe <<a href="mailto:johndoe@webkit.org">johndoe@webkit.org</a>>
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.</pre>
</div>
</p>
<hr>
<span>You are receiving this mail because:</span>
<ul>
<li>You are the assignee for the bug.</li>
</ul>
</body>
</html>