Re: FileMerge trouble with XCode 3.1.x
Re: FileMerge trouble with XCode 3.1.x
- Subject: Re: FileMerge trouble with XCode 3.1.x
- From: Chris Backas <email@hidden>
- Date: Fri, 23 Apr 2010 12:19:00 -0400
On Apr 23, 2010, at 11:47 AM, Rich Siegel wrote:
> On 4/23/10 at 11:35 AM, email@hidden (Chris Backas) wrote:
>
>> However, if I've made changes AND there are changes in the HEAD
>> brance
>> (a true merge) then it becomes a total mess, as again ALL arrows go
>> left to right. Doing the same compare in XCode 2.5 produces the
>> correct results, and the same exact version of FileMerge is launched
>> in BOTH cases (2.4). Even BBEdit is getting it wrong when invoked by
>> XCode 3.1.
>
> I'm not completely sure I'm following you correctly :-) but if you
> go to the "SCM" preferences in Xcode (and please take careful note
> of the product name's capitalization :-)), there's a setting for
> "Display local files on the:". I don't use Xcode or FileMerge for
> comparisons, but on my setup, that popup is set to "Right". If yours
> is different, perhaps that explains your observed behavior?
I think I gave a better explanation in the reply I just sent to Jens
(I hope!)
I'll try to get the capitalization right, I never even noticed that!
It's like when I started here and pronounced OS X as "OS Eks", all the
longtime Mac people made faces at me. Still haven't completely
adjusted to that ;)
>
>> So is this a bug in XCode? A bad setting I have someplace? Is there
>> a workaround?
>
> I do virtually all of my svn work in BBEdit, with the remainder from
> the command line. Since you have BBEdit, you could try the built-in
> svn tools and see if they work for you. Another option to consider
> might be Cornerstone, which presents a really nice GUI for working
> with svn repositories and working copies.
That may be a good option, but I think I'd have to sell it. "Why are
we upgrading if it's a step backward in functionality?" You know,
ignoring how many ways Xcode 3 works better ;)
Chris Backas
Bristol Capital, Inc.
CONFIDENTIALITY NOTICE: This email (and any related attachments) contains information from InfoPlus (a service of Bristol Capital, Inc.). It is intended only for the addressee and may contain information that is confidential and/or otherwise exempt from disclosure under applicable law. If you are not the intended recipient or are acting as agent for the intended recipient, any use or disclosure of this communication is prohibited. If you have received this communication in error, please notify me immediately to arrange for the appropriate method of returning or disposing of the communication. If our respective Companies have confidentiality provisions in effect, this email and the materials contained herein are deemed CONFIDENTIAL and should be treated accordingly unless expressly provided otherwise.
_______________________________________________
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