SCM Compare Lacks Ancestor?
SCM Compare Lacks Ancestor?
- Subject: SCM Compare Lacks Ancestor?
- From: Chris Backas <email@hidden>
- Date: Wed, 1 Dec 2010 12:15:50 -0500
Hello all,
I'm trying to find a solution to an annoying problem with XCode's
"Compare" function when working with SCM (svn in this case).
Basically, whenever I do a comparison in XCode 3 and later, the file
on the right is considered "new" and the file on the left is
considered "old" - in other words all changes are shown as going from
whatever's on the left to whatever the version on right has.
That's a very naive way of looking at things when you're working with
others on a project though. For instance, if a co-worker has checked
in changes to the same file that I'm working on, an SCM Compare will
claim that I'm reverting all of his changes with my copy, when this
isn't the case. It's very tedious to first figure out who really
changed what, set all the arrows appropriately, and then start over
from the top to review the changes.
It seems to me that the problem is that FileMerge isn't being given an
ancestor version to compare against - the revision of the file that
was current when I started making my changes. XCode 2.5 does this
correctly, showing the current changes from *both* copies merging into
the final version as I would expect. But it's been broken since 3.0
and remains so even in the most current release.
Changing the program used for the comparison from XCode to FileMerge
to even BBEdit doesn't give correct results, so I believe the problem
is with XCode. Is there a workaround or a setting for this? I can't
believe nobody's found this to be a problem worth fixing!
Thanks for any insight,
Chris Backas
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