iPhone version control tools (subversion)

Question

I've used iPhone SDK and tools for several months. XCode seems pretty nice, but there is one tool which I don't get: FileMerge. How can anyone use it for comparing files or doing merge?

Seriously now, what do you really use?

My use case is subversion database on remote server, few local developers working on same project as well as few remote developers. Cannot call/talk each person separately to ask what did they do, must have usable file/folder diff/merge tool. Looking for graphical version control front-end, which integrates nicely with XCode.

I would prefer Beyond Compare myself, been happy user for years, but it's not available for Mac OS X (yet).

Answer 1

I know you are probably looking for a XCode based answer/solution. But here is what I do:

Everytime I must do a merge, I launch Eclipse which has a nice SVN plugin that will do merges decently. If you have some experience in Eclipse platform you will have no problems in setting this up. Otherwise, you might want to do a little bit of reading on how to install plugins on Eclipse platform.

Hope it helps.

Answer 2

I got by with FileMerge for a while but it's not great, I agree.

Now I uses Changes, which I recommend.

If you're using SVN I'd also highly recommend Versions as an SVN client.

Answer 3

Although I prefer tkdiff for two-way merge, there are several utilities available especially for mac:

• Araxis
• DeltaWalker

And there is a generic question about three-way merge tools.

Answer 4

We chose SmartSVN for now. My more experienced colleague checked several Mac apps and chose that one based on its merge feature. Thanx for recommendations nevertheless!

http://www.syntevo.com/smartsvn/index.html