December 2010
1 post
Merging a Mercurial repository back into...
In a recent project, I forked an upstream SVN repository into a new Mercurial repo, to do some exploratory programming. The exploration proved very fruitful, so I decided to merge the code back into the upstream SVN repo.
Should be simple, right? Wrong. For posterity, here’s a high-level walkthrough that might also be of interest to others.
The Premise
Your case might differ from mine,...