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: Rich Siegel <email@hidden>
- Date: Fri, 23 Apr 2010 11:47:36 -0400
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?
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.
Good luck,
R.
--
Rich Siegel Bare Bones Software, Inc.
<email@hidden> <http://www.barebones.com/>
Someday I'll look back on all this and laugh... until they
sedate me.
_______________________________________________
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