I’m in a pickle. There’s a project at $WORK that I should have been paying closer attention to (but haven’t). We’ve taken some 3rd party software (guanxi as it happens), and made some modifications in order to form our own custom distribution. But:
- We started modifying what was then the trunk.
- The trunk has moved forwards.
- Our modifications are not isolated chunks of work (though they should be).
In other words, it’s a classic merge scenario. Except that both our changes and the trunk are contained within a CVS repository. This means that the original ancestor (the point at which divergence started) can be somewhat difficult to ascertain.
Thankfully, I’ve had moderate success using
git cvsimport to pull everything into a git repository. Well, actually five git repositories, thanks to
git cvsimport not quite understanding CVS’ modules file format. So,
git merge should assist me. But of course, I’m unfamiliar enough with the guanxi code to know how to successfully resolve conflicts. Best of all, it looks like new development which is similar to ours is happening on a branch destined to go into the trunk.
Where does this leave me? For now, a long session of merging with the developer who did the changes. But longer term, we also need to:
- Split out our code changes into their own packages (or for preference, project).
- Regularly merge in changes from trunk.
- Talk to the original developer about whether or not he can make life easier for us.
- Switch to using git proper rather than developing in the original CVS tree.
It doesn’t help that the project in question is a Java webapp — we want to reuse the classes in that webapp as a jar file in our own webapp. This is yet another complicating factor…
My head hurts.