Branching Code
When to branch your code will have a major impact on how easy the code base is to manage. Branching the code at the wrong time can really kill the long term management of the source code. Take a read of this branching approach, it has worked very well in all the places I have worked. The web site has a few great entries on source code management that are worth looking for.