> If my memory serves, previous "big" changes to the codebase have been
> handled by having a conditional compilation option which switches on the
> new code (and switches off some old code if needed) and putting all changes
> in CVS HEAD. This allows people to try it if they want to, and avoids what
> I understand is the main problem of CVS branches, which is reintegration
> when it is complete.
I don't exactly need to do "big" changes (as in many LOC), but some intrusive
and scattered ones. Conditional compiles would be a _major_ hassle to this
end. OTOH, I have never had any notable trouble merging branches...
Flightgear-devel mailing list