Monday, October 15th, 2007
So this afternoon I found out that because of the way I set cvs-trunk-base up, you’ll have to merge every time you do a pull from cvs-trunk-mirror.
This is fairly annoying and generates useless merge commits that probably aren’t the same merges that other people have done, which means you have to do another merge when sharing data between clones of cvs-trunk-base. I think what I was trying to get Mercurial to do was something along the lines of overlay repositories, but support for that sort of thing isn’t quite there yet.
So I did some thinking, and came up with a new plan. I’m going to do two things differently:
- I’m going to have NSS and NSPR checked directly into the hg repository. There’s really no reason to have them downloading separately for the purposes of this mirror, which is to facilitate Mozilla 1.9 work.
- Instead of having you pull from cvs-trunk-mirror, I’ll run jst’s hg-track-cvs on this new repository. It seems like a much better solution that trying to trick hg into reparenting revisions.
Hopefully this should create a much nicer place to clone from to do Mozilla 1.9 work with Mercurial.
Oh, and apologies for the repostings that happened earlier today — I upgraded to WordPress 2.3 and converted a bunch of categories into tags. This seems to have caused a number of old articles to appear in my feed again.