Re: Better diff tool?
Re: Better diff tool?
- Subject: Re: Better diff tool?
- From: David Fang <email@hidden>
- Date: Thu, 28 Apr 2005 02:41:48 -0400 (EDT)
Hi,
For good revision diff visualizations, give "tkdiff" a try, which
is part of the "tkcvs" distribution, and provides colorized diffs and
annotations. Tkcvs is just a Tcl/Tk front-end to CVS. tkcvs is available
through fink, or you can just download the source and install it manually.
> I was really (really, really) disappointed with XCode's file difference
> tool. It's pretty basic. The big functional disappointment is that it
> can't ignore CVS file tags (e.g.: "$Revision: 1.6$") so every file is
> flagged as different.
$Revision:$ or $Id:$ tags are something that CVS/RCS handles specially.
Though they are always displayed as revision differences, they are ignored
(and overwritten) at commit/merge time. Diffs across *branches* in the
tag invariably show up as conflicts, as dictated by the diff rules. I'm
not aware of a more intelligent diff, but writing a shell/sed/awk-script
to detect that the revision tag is the only conflict in a file is not
beyond reason, even automatically resolving such a conflict case is not
too difficult. (It hasn't bothered me enough to warrant doing this...
yet.)
> This probably extends beyond FileMerge and into XCode actually, because
> it would be important for XCode to realize that these "differences"
> should be ignored between CVS branches.
>
> There are other failings, but they are less functional and more
> experiential (lack of colorization to show conflict type; very few UI
> widgets (well, one, really) to manipulate the files. My gold standard
> would probably be something along the lines of Eclipse's merge tool or
> combined with SlickEdit... but neither of them solve the XCode problem.
>
> Is there a solution out there?
David
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden