This is the third article in a series where I discuss how I dealt with the challenge of maintaining two separate but similar web sites in source control. This kind of scenario doesn’t really follow the Version->Maintenance->Next Version linear development process. Instead, it has common code and separate themes.
In article one, I talked about your choices in how to work with this kind of structure.
In article two, I talked about how to use the Convert extension to split the common code out of our database.
In this article, I’m going to talk about the third and least friendly choice:
Finally, if you believe that the common code will change infrequently, you can avoid site merges and instead use the hg export and import commands to merge only certain transactions to the other branch. This last choice may seem the most expedient – especially if you’ll have many small differences in the common code – but it’s also the most error prone. Should another developer accidentally do a push and merge, you’d better know how to recover from it.
Read the rest of this entry »
Categories: Branching and Merging, Mercurial | No Comments »