I've just done the putback that upgrades Mercurial in Solaris to 1.0.
Assuming it doesn't get backed out, this will be in Nevada build 88.
The only incompatibility of note is that hgmerge(1) has been removed, as
the bulk of its functionality has been incorporated into mercurial itself.
The rules for trying merge programs are as follows:
- HGMERGE, if set
- then the tool matching a pattern in [merge-patterns], if found
- then tools by priority:
- ui.merge has the highest priority
- followed by tools specified in [merge-tools], with given priorities
- the 'hgmerge' script is added with the lowest priority
- tools that can't be found are dropped
- list is narrowed based on gui, symlink, and binary support
- if all else fails, we use the new internal:merge
If you already had any configuration to point to an external merge program,
that will continue to work. Otherwise, you'll need to add some. Note that
neither Solaris nor OpenSolaris ship with any external merge tools at the
moment.
Please read hgrc(5) for more information, and please pass this on to any
else you think would benefit from this information.
For anyone building the SFW gate, you will now find some noise at the end
of the mail message, in the "Impact on file permissions" check. Getting
rid of this noise requires a version of pmodes from the SUNWonbld package
that is dated April 7 or newer. The noise doesn't indicate that anything
is wrong with the build, it's just noise, so there's no need to scramble to
replace pmodes if the noise doesn't bother you.
Thanks,
Danek
