James Falkner wrote:
Darren J Moffat wrote:
One of the reasons I'm doing this is I believe we need a GUI merge
program to be shipped by default and I'm trying to find one that suits
the Solaris distribution of OpenSolaris.
Does anyone have other suggestions to try ?
Two other possibilities come to mind: gvim (in diff mode)
Hmn now since I'm a vim user..... That hadn't crossed my mind.
I'm going to do the same merge again. I love that I can with two
simple hg commands rollback the merge in the same workspace and try
again - and if I couldn't the workspaces are ZFS filesystems so I could
snapshot and rollback that way too :-)
and kdiff3. Screenshots for kdiff3 look impressive
http://kdiff3.sourceforge.net/doc/screenshots.html
Yeah but it drags in libqt and Solaris doesn't have that. Some other
distros do but Solaris doesn't and I just don't want to open that can of
worms.
but I've never used it. gvim, sounds a bit scary but some of the
developers in my immediate workgroup use it and get by.
There are emacs instructions for merging on the Mercurial wiki ;-)
--
Darren J Moffat
_______________________________________________
tools-discuss mailing list
tools-discuss@opensolaris.org
