On Sun, Oct 21, 2018 at 3:52 AM Luca Toscano <toscano.l...@gmail.com> wrote:
> Hi everybody,
>
> while trying to merge r1844401 in 2.4.x I noticed some conflicts, that
> as far as I can tell are coming from r1673947. It seems a big and old
> change that was never backported, but it mixes xml and transformations
> (that it is not ideal). What is the best way forward?
>
> A quick solution, rather than backporting the change, would be to run
> find + sed and remove the trailing whitespaces from 2.4.x's .xml
> files, commit the change and re-build the docs (two separate commits
> as always).
>
> I would of course do it only after the T&R that it is ongoing to avoid
> big doc changes.
>
> Thoughts?
>
Whitespace changes should always be a distinct commit; it's really trivial
to validate they did nothing else with an svn diff -x --ignore-all-space.
Might be too late trying to keep these in sync.
Messy history can be backported in part to sources only. I'd usually use
something like this to split out the generated bits;
svn merge -c...
svn status | awk `//{print $2;}` | grep "\.html" | xargs svn revert
svn status
...
svn commit
With the history already recorded, then just `./build.sh all` and commit
the generated parts (the historical svn rev was recorded above from the
merge.)
As long as the major svn revs are captured, it probably doesn't make a lot
of difference to capture svn rev history of every commit which fixed ""'s
and similar minor formatting consistency.
