Greetings!
We are starting a project to consolidate two web applications into one. They have become very similar, and the decision was made to make them one application. We also don't have any type of source management system.
Enter Subversion.
Coincidentally, I'm implementing Subversion as this is starting up, and have the luxury(?) of designing the repository with this project in mind.
Normally, Each of the existing applications would be their own projects with their own trunks, branches, and tags. However, this new application will be inheriting a lot of the existing code from the current applications. Also, development will be continuing on the existing applications, and those changes will need to be brought forward to the new application. Once the new application goes live, the old applications will die.
Basically, the new application will be a compilation of the best the existing applications have to offer.
Does anyone have any suggestions on how to manage this without making my head explode?
Having the new application as some sort of branch of BOTH existing applications would be great, but would never work. The underlying structures of the existing applications are extremely different. I'm pretty sure that isn't possible anyway.
My current "best idea" is to have the new application be a branch of one of the existing applications. That will, at least, allow ongoing development to be merged from one of the applications. Then I'll just have to suck it up and manually handle any merges of new development from the other application. Then, once the new application goes live, move it to its own trunk.
Thoughts?
-Luke
Received on Tue Jul 3 22:57:07 2007