156618 2016-04-14 21:46:05 -0700 svn-apply: add option for ignoring changes to ChangeLog files 2016-04-18 10:13:22 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dburkart dburkart dbates lforschler webkit-bug-importer oldest_to_newest 1183995 0 dburkart 2016-04-14 21:46:05 -0700 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. 1183996 1 dburkart 2016-04-14 21:46:41 -0700 <rdar://problem/25737270> 1184256 2 276519 dburkart 2016-04-15 16:08:13 -0700 Created attachment 276519 patch Adds an option to svn-apply to not apply changes to ChangeLog files. 1184369 3 276519 darin 2016-04-16 10:42:51 -0700 Comment on attachment 276519 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? 1184709 4 dburkart 2016-04-18 10:13:22 -0700 Committed r199674. http://trac.webkit.org/changeset/199674 276519 2016-04-15 16:08:13 -0700 2016-04-16 10:42:51 -0700 patch svn-apply.patch text/plain 2022 dburkart ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmMTFi ODJjLi45MTZjNzEzIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTYtMDQtMTUgIERhbmEgQnVya2FydCAgPGRidXJr YXJ0QGFwcGxlLmNvbT4KKworICAgICAgICBzdm4tYXBwbHk6IGFkZCBvcHRpb24gZm9yIGlnbm9y aW5nIGNoYW5nZXMgdG8gQ2hhbmdlTG9nIGZpbGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTY2MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBhZGRzIGEgbmV3IG9wdGlvbiB0byBz dm4tYXBwbHksIC0tc2tpcC1jaGFuZ2Vsb2dzLCB3aGljaCBzaG9ydC1jaXJjdWl0cyBvdXQgb2YK KyAgICAgICAgcGF0Y2goKSBpZiB0aGUgZmlsZSBpbiBxdWVzdGlvbiBpcyBhIENoYW5nZUxvZy4K KworICAgICAgICAqIFNjcmlwdHMvc3ZuLWFwcGx5OgorICAgICAgICAocGF0Y2gpOgorCiAyMDE2 LTA0LTE1ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAg ICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTk5NjAwLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy9zdm4tYXBwbHkgYi9Ub29scy9TY3JpcHRzL3N2bi1hcHBseQppbmRleCBmOTBhYTY1Li5h ZTIzODgyIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3N2bi1hcHBseQorKysgYi9Ub29scy9T Y3JpcHRzL3N2bi1hcHBseQpAQCAtOTAsMTYgKzkwLDE4IEBAIG15ICRtZXJnZSA9IDA7CiBteSAk c2hvd0hlbHAgPSAwOwogbXkgJHJldmlld2VyOwogbXkgJGZvcmNlID0gMDsKK215ICRza2lwQ2hh bmdlTG9ncyA9IDA7CiAKIG15ICRvcHRpb25QYXJzZVN1Y2Nlc3MgPSBHZXRPcHRpb25zKAogICAg ICJtZXJnZSEiID0+IFwkbWVyZ2UsCiAgICAgImhlbHAhIiA9PiBcJHNob3dIZWxwLAogICAgICJy ZXZpZXdlcj1zIiA9PiBcJHJldmlld2VyLAotICAgICJmb3JjZSEiID0+IFwkZm9yY2UKKyAgICAi Zm9yY2UhIiA9PiBcJGZvcmNlLAorICAgICJza2lwLWNoYW5nZWxvZ3MiID0+IFwkc2tpcENoYW5n ZUxvZ3MKICk7CiAKIGlmICghJG9wdGlvblBhcnNlU3VjY2VzcyB8fCAkc2hvd0hlbHApIHsKLSAg ICBwcmludCBTVERFUlIgYmFzZW5hbWUoJDApIC4gIiBbLWh8LS1oZWxwXSBbLS1mb3JjZV0gWy1t fC0tbWVyZ2VdIFstcnwtLXJldmlld2VyIG5hbWVdIHBhdGNoMSBbcGF0Y2gyIC4uLl1cbiI7Cisg ICAgcHJpbnQgU1RERVJSIGJhc2VuYW1lKCQwKSAuICIgWy1ofC0taGVscF0gWy0tZm9yY2VdIFst bXwtLW1lcmdlXSBbLXJ8LS1yZXZpZXdlciBuYW1lXSBbLS1za2lwLWNoYW5nZWxvZ3NdIHBhdGNo MSBbcGF0Y2gyIC4uLl1cbiI7CiAgICAgZXhpdCAxOwogfQogCkBAIC0zMzIsNiArMzM0LDExIEBA IHN1YiBwYXRjaCgkKQogICAgICRhZGRpdGlvbiA9IDEgaWYgKCRkaWZmSGFzaFJlZi0+e2lzTmV3 fSB8fCAkcGF0Y2ggPX4gL1xuQEAgLTAsMCAuKiBAQC8pOwogICAgICRkZWxldGlvbiA9IDEgaWYg KCRkaWZmSGFzaFJlZi0+e2lzRGVsZXRpb259IHx8ICRwYXRjaCA9fiAvXG5AQCAuKiBcKzAsMCBA QC8pOwogCisgICAgaWYgKGJhc2VuYW1lKCRmdWxsUGF0aCkgZXEgIkNoYW5nZUxvZyIgJiYgJHNr aXBDaGFuZ2VMb2dzKSB7CisgICAgICAgIHByaW50ICJTa2lwcGluZyAnJGZ1bGxQYXRoJyBzaW5j ZSAtLXNraXAtY2hhbmdlbG9ncyB3YXMgcGFzc2VkIG9uIHRoZSBjb21tYW5kIGxpbmUuIjsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGlmICghJGFkZGl0aW9uICYmICEkZGVsZXRpb24g JiYgISRpc0JpbmFyeSAmJiAkaGFzVGV4dENodW5rcykgewogICAgICAgICAjIFN0YW5kYXJkIHBh dGNoLCBwYXRjaCB0b29sIGNhbiBoYW5kbGUgdGhpcy4KICAgICAgICAgaWYgKGJhc2VuYW1lKCRm dWxsUGF0aCkgZXEgIkNoYW5nZUxvZyIpIHsK