FileMerge trouble with XCode 3.1.x
FileMerge trouble with XCode 3.1.x
- Subject: FileMerge trouble with XCode 3.1.x
- From: Chris Backas <email@hidden>
- Date: Fri, 23 Apr 2010 11:35:36 -0400
Hello all,
I'm migrating my company from XCode 2.5 to XCode 3.1.x on Leopard
machines. We write software for internal use only, so we take a long
while to validate our products on new OS releases (in this case
Leopard), and developers run the same OS as production machines so
that our testing is more effective.
Anyway, this transition is going mostly smoothly, but I'm having a
problem with doing diffs in XCode 3.1 that doesn't occur in 2.5.
Basically, FileMerge (or XCode itself if the option is set that way)
ALWAYS displays ALL changes as going left to right. If I have the SVN
Head branch displayed on the right and I'm just comparing against a
proposed update, this is fine. If I've made my own changes, the
displayed diff shows everything changing in the wrong direction. This
is annoying, but not killer.
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.
So is this a bug in XCode? A bad setting I have someplace? Is there a
workaround?
Any insight is appreciated.
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