On Thursday 23 Feb 2006 16:22, Guillaume Laurent wrote: > I think cvs can be told to ignore whitespace-only changes in > updates/merges. Otherwise, even though it's a chore, we could re-indent > the relevant files if needed.
It's important not to commit them at all. Otherwise you won't know if you might be reverting a bug fix in the target branch by accident. I'm pulling the useful bits out of diffs, they're generally fairly localised. Also in many cases they're bracketing changes (K&R to Stroustrup, gah) which CVS wouldn't be able to overlook. What's annoying is that it makes applying diffs by hand much harder too, because the line numbers no longer match up -- sometimes by dozens of lines. > These should certainly go in but I'd rather do the merge in one pass, if > only to make things clearer in cvs history. Yes, I just meant do I include them when merging the rest. Chris ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ Rosegarden-devel mailing list [email protected] - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
