Re: svn diff and FileMerge
Re: svn diff and FileMerge
- Subject: Re: svn diff and FileMerge
- From: Seth Milliken <email@hidden>
- Date: Tue, 22 Feb 2005 10:42:05 -0800
Thanks, Scott! I had not even considered that there would be an
operation that did a diff that was not called "diff". The light of
hindsight now illuminates the "Compare With" menu item and the
separate "Compare Handling" and "Diff Options" sections of the "SCM
Access" preferences pane (perhaps these sections should have a
vertical divider between them like "Code sense" and "Function pop-up"
sections of the "Navigation" pane.)
The La Chose script red herring certainly didn't help my vision much
either. I can only wonder now what problem they're attempting to
solve.
At 18:54 -0800 2005/02/21, Scott Tooker wrote:
The "Diff" menu item is always done textually in Xcode. The
"Compare" menu item on the other hand, uses FileMerge.
Scott
On Feb 21, 2005, at 6:11 PM, Seth Milliken wrote:
In a Subversion controlled Xcode 1.5 project, when I do a diff on a
file I get a textual diff rather than a FileMerge mediated diff
even though I have "FileMerge" selected for the "View comparisons
using:" option in the "SCM Access" pane of the preferences.
After doing some research on this, this looks like it may be a bug
or misfeature in Xcode, since Xcode does not appear to actually
support FileMerge mediated diffs for svn.
There are two scripts in the SCPlugin project that purportedly
bridge this gap, one using Ruby the other using zsh, but I have not
been able to get either of these to work.
<http://svn.red-bean.com/scplugin/trunk/tools/svnopendiff>
<http://svn.red-bean.com/scplugin/trunk/tools/svnopendiff.rb>
La Chose Interactive, developers of svnX, offer a set of scripts to
do this as well.
<http://www.lachoseinteractive.net/en/community/subversion/goodies/>
I've tried using all of these scripts by setting them as the "View
comparisons using:" option, and by setting their paths in the
"diff-cmd" option in the "[helpers]" section in my
"~/.subversion/config" file. All to no avail. They work from the
command line, but not in any automated context.
Is anyone else successfully getting FileMerge diffs out of svn
controlled Xcode projects?
--
_____________________________________________________
Seth Milliken email@hidden
San Francisco PGP Public Key Available
_____________________________________________________
_______________________________________________
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