• Open Menu Close Menu
  • Apple
  • Shopping Bag
  • Apple
  • Mac
  • iPad
  • iPhone
  • Watch
  • TV
  • Music
  • Support
  • Search apple.com
  • Shopping Bag

Lists

Open Menu Close Menu
  • Terms and Conditions
  • Lists hosted on this site
  • Email the Postmaster
  • Tips for posting to public mailing lists
Re: Attaching actions to buttons
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Attaching actions to buttons


  • Subject: Re: Attaching actions to buttons
  • From: Scott Tooker <email@hidden>
  • Date: Mon, 21 Feb 2005 18:54:04 -0800

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

_______________________________________________ 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
  • Follow-Ups:
    • Re: svn diff and FileMerge
      • From: Seth Milliken <email@hidden>
References: 
 >Re: Attaching actions to buttons (From: Seth Milliken <email@hidden>)

  • Prev by Date: Re: svn diff and FileMerge
  • Next by Date: rsrc file with PICT items - copied to Package as zero K file
  • Previous by thread: Re: Attaching actions to buttons
  • Next by thread: Re: svn diff and FileMerge
  • Index(es):
    • Date
    • Thread