Danek Duvall wrote: > I'm sponsoring this case for myself; the release binding is Minor. > > > As part of "Mercurial integration" (PSARC/2006/417), hgmerge(1) was > documented as Committed. > > This project specifies the removal of that utility. No version of Solaris > has shipped yet with that interface, and the project team asserts that the > change is non-controversial. > > This utility was essentially a configuration file masquerading as a shell > script. It contained a list of three-way merge tools and attempted to > execute them, in an order of preference hard-coded into the script, until > one was successful. > > Shortly before the release of mercurial 1.0 hgmerge(1) was removed from the > distribution, because the core mercurial code acquired basic three-way > merge functionality (a la RCS merge or diff3) in addition to a new > configuration section for external merge programs. These two additions > obviated the need for hgmerge(1).
I have no issue with the removal per say. Even though I personally do use hgmerge - though I use a modified version of it in ~/bin/hgmerge (modified to run twmerge or gpyfm). However I'm confused as to why this is being done as a standalone case rather than as part of a case that introduces Mercurial 1.0 ? Is this basically the only visible interface change in 1.0 or is it that this is best done prior to the case that introduces the later version of Mercurial. Either way this case can proceed as is, I'd just like to know so of the sync issues since I'm a heavy mercurial user at the moment. -- Darren J Moffat
