Xcode 5.1.1, Mac OS 10.8.5
I just got in this morning with instructions to update our iOS project workspace.
So, with the workspace open, I do that. I go to Source Control and select Update.
Xcode first opens a comparison window with the message "No Editor".
Finally getting used to this, I wait 30 seconds for something to appear.
Finally in the left hand pane, a list of 20 files appear all with a U to the right of them.
If I select any of the header, method or project files. Xcode shows the source of each file with the local on the left and the head as expected on the right. As expected, all the conflicts are marked in red in the scroll bar.
Looking at each of the conflicts, I see that the lines marked as conflicts are exactly the same in my local copy and in the head on the SVN server.
I tested this by copying each line and comparing each for equality and they are exactly the same.
Why IS Xcode marking them as being in conflict then?
This is the same for every one of the 20 files that are marked as needing an update.
Now, of course, the Update button is grayed out. It's been grayed out for about 15 minutes now. I know this because I walked out to my car, came back, examined all of the lines that are supposed to be in conflict and typed this engrossing email
Why does Xcode think that the entire project needs an update, why does Xcode mark files as needing updates when all the items that it sees as conflicts have no conflict at all, why does Xcode think the project needs an update and keeps the Update button grayed out?
I've got two PhD's looking at the screen now (yeah, I have screenshots) with each one shaking their head.
Everyone on our team has this exact same issue with Xcode's SVN support. (No, we can't change to Git, that's beyond our control.) 20 minutes now and Update is not yet enabled - for files that Xcode states need updates - for files that Xcode flags as having conflicts - for lines of code that are identical.
Switching to the command line to see how long the update takes.
Under a minute to switch directories and update all folders to version 61 from the command line.
I can't believe that Apple lets Xcode ship with such horrible SVN support.
Either fix SVN support it or pull it from Xcode. This is an utter disgrace and a massive waste of time for your developers.
|