On Tue, Aug 25, 2009 at 07:45:18AM -0400, Thomas Marsh spake thus: > Hello, > > I know that this is probably a configuration management question, but... > > We have a situation where we need to make a copy of an application for > another division. The division will use this new version of the software > for at least the next several years. At some point in the future, we may > attempt to get everyone back on one version. > > So the question: should we create a new branch, and have the other > division work from the new branch, and we keep working from the main > trunk, or should we copy the code to a new module? > > Any advice is appreciated. > > Tom
Hi Tom, If the other division does not need to make changes to the source tree, I would recommend that you just create a CVS tag to mark the version that you're giving them, and at some point in the future work on moving them to the "latest" version from the trunk. If they do need to make changes and you want to keep the door open to getting back on one version without losing those changes, then I would recommend that you create a separate branch on which to make those changes, and merge those changes frequently either to the main trunk or some other branch created just for that purpose. The longer you go between merging and resolving conflicts, the more painful it becomes -- not the least because it becomes less clear how to resolve conflicts. I don't see any benefit in copying the code to a different module (provided that shared access to the single CVS repo is not a problem, organizationally speaking). Merging changes from a separate module would be a lot more manual work in the future. HTH, -Al -- a l a n d. s a l e w s k i [email protected] -------------------------------------------------------------------- The New World Order Strange black choppers in the night Abducting our cows -------------------------------------------------------------------- Generated from Haiku-O-Matic: www.smalltime.com/haiku.html
