[Bcc'ing opensolaris-discuss, since tools-discuss seems not to cover everyone]
If you're not using a SUNWonbld package from the scm-migration project, or have configured Mercurial to use a merge application other than gpyfm you can (and should) ignore this message. gpyfm (the pygtk based merge tool) has been removed from the scm-migration project gate, if you are currently using gpyfm for your merges under Mercurial you will have to make changes (if you configured your ~/.hgrc with hgsetup(1), this is you). As of now, hgsetup(1) will configure your ~/.hgrc such that with Hg 1.0 (which is in snv_88 and greater) filemerge(1) from TeamWare will be used if it is available, and meld or gpyfm if it is not. If you're on the SWAN and have TeamWare in your $PATH, this should just work for you. If you're not on SWAN, you almost certainly have none of those tools at the moment. There are meld packages both in SFE and available from: http://opensolaris.org/os/project/scm-migration/files/ gpyfm is available from: (source) ssh://anon at hg.opensolaris.org//hg/scm-migration/gpyfm-gate and: (package) http://opensolaris.org/os/project/scm-migration/files/ Otherwise, for those not on SWAN, you'll want to find a suitable alternative for yourselves, I have no particular recommendation. If you're on SWAN and are still using Hg 0.9.5, a script such as: #!/bin/ksh exec /opt/teamware/bin/filemerge -a $2 $1 $3 $1 Set as ui.merge in your ~/.hgrc is sufficient to use filemerge for merges done under Mercurial, but we'd encourage you to upgrade to Hg 1.0 in the near future as the tools will drop support for 0.9.5 soon. A further heads-up about that will be sent to tools-discuss, at such a time as it happens. Please direct questions, comments, etc, to scm-migration-dev at opensolaris.org. Sorry for any inconvenience. -- Rich (and the scm-migration project)
