Subversion, xcode and problem with project.pbxproj

Question

Hi,

We use subversion to keep track of our code, just sharing code between us two. However we encounter a problem when we both add or remove file at the same time before the next commit. It seems that whenever we mess with Groups & Files, project.pbxproj under the project package will be modified and subversion cannot take care of that. As a result the project cannot be opened.

My guess is that project.pbxproj keep track of how groups and files are arranged. How do I make this work under Subversion? It is a text file, but somehow it's doesn't seem to be treated as such.

Answer 1

Firstly, is the .pbxproj file getting corrupted, or is it that the changes you make are not correctly reflected in it? (ie if you remove a file, but do not have the update in the .pbxproj file, does it refuse to load?)

If the .pbxproj file is text, you can tell subversion to store it as such by setting the svn:minme-type property.

Setting it to a text type will give you better merging, so whoever commits first save his changes, then when the other updates his working copy, the changes will be merged into the file. You should review changes when a merge occurs, even though subversion is good at this, its only a computer process and will not do what you expected occasionally.