• 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: Using SCM Compare with Xcode 3
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Using SCM Compare with Xcode 3


  • Subject: Re: Using SCM Compare with Xcode 3
  • From: Chris Suter <email@hidden>
  • Date: Tue, 18 Dec 2007 11:52:50 +1100


On 18/12/2007, at 11:21 AM, Dave Carrigan wrote:

I'm working with a project that uses Subversion for SCM. I made a change to a file and decided that I wanted to revert some, but not all of the changes. So, I right-clicked on the file, and selected "Compare".

So far, so good - Xcode's built-in merge tool comes up and I can select which changes I want from the repository revision and my local copy.

But, what do I do next? File->Save is greyed out, as is File->Save As. If I close the merge tool window, it prompts me to "Save files before closing", and gives me a "Don't Save", "Cancel", and "Save All" button. If I click "Save All" another dialog flashes over top of the merge tool window that looks kind of like a file save dialog, but then it and the merge tool window both immediately disappear. And of course, all the changes I meticulously selected are lost.

I encountered the same problem recently.

A quick search reveals:

http://www.cocoabuilder.com/archive/message/xcode/2007/11/5/16840

(You did try searching the list before posting, right?)

- Chris

_______________________________________________
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


References: 
 >Using SCM Compare with Xcode 3 (From: Dave Carrigan <email@hidden>)

  • Prev by Date: Using SCM Compare with Xcode 3
  • Next by Date: Re: Interpreting "undefined symbols"
  • Previous by thread: Using SCM Compare with Xcode 3
  • Next by thread: Re: Interpreting "undefined symbols" {almost fixed}
  • Index(es):
    • Date
    • Thread