Riccardo,
On Sun, Oct 29, 2017 at 9:41 PM Riccardo Mottola <
address@hidden> wrote:
Hi,
On 29/10/2017 18:05, Matt Rice wrote:
> I would change it something to the effect of:
> "When submitting via a mailing list include your ChangeLog entry in
> the contents of your email rather than in the diff."
I second that. I like to apply the patch as-is, test it and have a
"ready" change log entry to copy&paste, however a changelog "diff"
creates most often a conflict, since a time and other changes might have
mixed in, as well as I might have reviewed or modified the patch itself.
In other words, I'd like to know what I am am patching, but a material
diff to ChangeLog is a nuisance.
Riccardo
I'm not sure you're addressing the same thing as Matt and I do.
The difference is what happens when we have a change *outside* of the mailing list contribution process. A PR on a web UI that I can merge with a single click is what should be simplified.
Whether ChangeLog is in the diff sent via email, that makes no difference to me, as applying such a patch is painful anyway, not something I can review and merge simply by opening a browser (in case of a simple patch). If such a web-mergable patch does not include a ChangeLog entry in the commit itself, then whoever merges it must remember to do so themselves in a separate commit. Hardly useful.