James Falkner wrote:
Darren J Moffat wrote:
It took me a few merges to get used to the tkdiff UI but it was similar
enough to filemerge's UI that it wasn't a great leap. I had to
customize
the colors and behavior to that of filemerge before it all made sense.
Care to share those customisations ?
#
# Of course these don't make tkdiff indistinguishable from filemerge
# but it's better than the defaults IMO
Thanks that did help a bit.
I did notice though that tkdiff doesn't allow you to edit the result
file, that is a big loss. I find sometimes I have to do that - often
just for formating but if I don't do it at the time of merging those
lines I will forget.
I just did a simple one file experiment (using passwd.c in case
you care) where I made conflicting changes to the same lines in a source
and destination repository. The changes were variable renames and
moving around code as well as changing guards on if statements.
I then did the merge with tkdiff and meld. For this test it seems they
were pretty much equivalent but meld allowed me to edit the resulting
file.
The one thing I found with meld though was my screen wasn't wide enough
(1680x1050) since it wanted to display the three files side by side, in
contrast to filemerge and tkdiff where you get the two source files side
by side and the result file else where.
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 ?
--
Darren J Moffat
_______________________________________________
tools-discuss mailing list
tools-discuss@opensolaris.org
