On Thu, Apr 03, 2008 at 10:09:42PM +0100, John Levon wrote: > On Wed, Apr 02, 2008 at 01:43:33PM -0700, Danek Duvall wrote: > > > > I guess it's ok, but I'm confused -where did you stash hgmerge? - it's > > > deleted from prototype_com. > > > > hgmerge is gone. I need to run a fasttrack for that. > > How do we specify the merge binary now? The xvm-gate tools have a > modified hgmerge that finds the 'merge' from RCS. How do people merge > sensibly with the new packages?
It all works as it did before, except that the "hgmerge" program simply isn't shipped. It seems to still fallback to "hgmerge" if it can be found, and you can still set the "HGMERGE" environment variable, or the "ui.merge" hgrc variable. So if you have your own hgmerge script, and you either already point to it or it's in your path (one of which you'd have had to do before), then you should be just fine. I can give you a package to try out and confirm, if you'd like. Danek
