|| at Dec 24, 2011 at 2:55 pm
Pierre Joye wrote:
Laruence refers to the PHP C source code and removing trailing white
spaces is a good thing as it is part of our CS.
Go ahead Laruence:)
Please don't. Changing whitespace en-masse makes it a royal pain to do
merges later. Please just fix them when you change the code on that line
There is no deal or pain to fix them in all branches at once. There is
no need either to do it all at once, but doing them while working on a
file in a separate commit before the actual change is just fine and is
a good practice.
I'm with Derek ... having commits that are just WS corrections can be irritating
when tracking changes ... but it would most definitely better to get them fixed
before moving to git which would lump mass commits like that together in a
change set and make rolling back changes a nightmare.
Logically it makes a lot more sense simply to leave them alone until such time
as a file is touched for other reasons ... and at that time then a separate
commit of the WS prior to the bug fix IS good practice. Bundling a whole array
of WS fixes across unrelated sections of code is not once you move to any DVCS