On Sun, Oct 21, 2018 at 11:13 AM Luca Toscano <toscano.l...@gmail.com> wrote:
> > I've never recorded history when backporting docs from trunk, I > haven't seen people doing it and I thought it was not necessary, but > after reading your comment now I am wondering if I did it wrong all > this time. I don't feel strongly about whitespace commits being > separate, but whatever convention we choose is fine to me. > As long as the commit message makes clear what changed, for docs this probably isn't so important. I've rarely gone back and modified the merge history when strong-arming a code backport which won't apply from a merge from trunk, either. As project we haven't been consistent, so don't fret. This is automatic, if you use the svn merge -c functionality. The reason we like whitespace shuffling and non-visible edits to be distinct is that it makes reading the patch for actual content changes much more straightforward. Maybe less critical with docs than code, but we have lots of some number of examples of illegible code changes that were buried by mass reformatting changes. Now it is on each reviewer to ignore the email notice and go back to the actual svn diff with --ignore-all-space, to read the actual code change.
