Having thought about this more, I think that we should have:
- 1 commit for all the whitespace changes (no trailing space, spaces to tabs)
- 1 commit for all the automated style changes (a little bit of whitespace correction would be okay here, just not every-single-line)
- Separate commits (or even numbers of them) for more involved changes (put all classes in namespaces, rename methods, etc)
This will make it easier to ignore the whitespace changes that will inevitably cause merge complexity from 3->4.
The other question is when? I think we should tie it to a specific release:
I think it comes down to the following choices:
- Just before alpha1
- Just after alpha1
- Just before alpha2
- Just after alpha2
- Just before beta1
I'd want to get the views of the people who do most of the cross-release-branch merging (from memory I think Damian, Ingo, and Dan Hensby do a lot of this, sorry if I've neglected anyone else) as it will have a material impact on that work.
Thanks,
Sam