I've not seen the latest emacs/ediff/emerge stuff yet, but you should at
least look at the merge manager in ClearCase.
It's one of the best parts of the tool (along with xlsvtree - the
graphical version/merge browser).
-- Thanks
Kevin
Kevin Mallory VP, Engineering, 604-484-6474
Active State - http://www.activestate.com - Programming for the People
QUALITY is never an accident; it is always the result of high intention,
sincere effort, intelligent direction and skillful execution; it
represents the wise choice of many alternatives.
This email may contain confidential and privileged material for the sole
use of the intended recipient. Any review or distribution by others is
strictly prohibited. If you are not the intended recipient please
contact the sender and delete all copies.
> -----Original Message-----
> From: Branko �ibej [mailto:brane@xbc.nu]
> Sent: Tuesday, January 30, 2001 2:17 PM
> To: Daniel Stenberg
> Cc: dev@subversion.tigris.org
> Subject: Re: How uniform can GUI clients be?
>
>
> Daniel Stenberg wrote:
>
> >> A GUI SVN client could offer simple diff and conflict
> viewing features.
> >
> >
> > I'd say this is one of the areas where a GUI client can
> show its power. A
> > really fancy diff viewer in different colours or traces
> what was done between
> > versions. Things that are tricky on a shell prompt and gets
> easier/nicer
> > within a GUI.
>
> Heh. We've got that. Its called Emacs+ediff+emerge.
>
> (I know, I know, not being constructive ... but I have yet to see the
> graphical diff/merge that beats Emacs in that respect.)
>
>
> --
> Brane �ibej
> home: <brane_at_xbc.nu> http://www.xbc.nu/brane/
> work: <branko.cibej_at_hermes.si> http://www.hermes-softlab.com/
> ACM: <brane_at_acm.org> http://www.acm.org/
>
>
Received on Sat Oct 21 14:36:20 2006