Mac version control with merge and support

views:

377

answers:

Mac version control with merge and support

I'm using a trial of Cornerstone and like the product but don't like the fact they have no support. Meaning, they never answer their email. I need a source control program that can handle merging through Subversion. Specifically, merging from a branch back into trunk. Cornerstone doesn't and from what I've read Versions doesn't either: http://groups.google.com/group/versions/browse%5Fthread/thread/e499755588b0f59b

Can anyone recommend a source control for Mac that does support merging and also has support?

--EDIT--

Based on comments and given that Versions and Cornerstone have such similar feature sets, would the main reason to buy Versions be its support?

Git, althought it isn't subversion (but has almost the same functions, with some extras).

yoda 2009-12-03 04:51:23

It should be clear from the question (i.e. Mac) that I'm asking for a native app.

4thSpace 2009-12-03 04:54:36

what do you mean by "native"? Git has a Mac version of the system .. http://code.google.com/p/git-osx-installer/

yoda 2009-12-03 04:56:58

Is Git online only or can it be installed and used completely offline like Subversion?

4thSpace 2009-12-03 05:12:04

can be offline, if you install the server version.

yoda 2009-12-03 05:23:42

That's incorrect, yoda. Git is not client server per se. Git is distributed yet can be disconnected. One of it's primary strengths is that no server is required, ever. Read this: http://whygitisbetterthanx.com/

Matt Long 2009-12-07 19:24:52

you're right, thanks for the tip!

yoda 2009-12-08 08:05:43

+1 A:

The svn command line program can perform a merge, albeit without the nice GUI interface to help you with it. It's a pretty basic feature.

svnX has been around for a while, and is a Cocoa-based app.

You can try SmartSVN, which is written in Java. Also many text editors such as TextMate support svn operations from within the editor.

There is also an open source OS X client called SCPlugin but development appears to be rather slow (no Snow Leopard version, for example).

Ken Liu 2009-12-03 04:55:35

I'll see if svnX can do the merge. If I accomplish that, Cornerstone should pick up the changes without much fuss right? Meaning, if I merge in one source control app and then switch back to another, should things continue jiving?

4thSpace 2009-12-03 05:09:21

svnX tells me it is to old to work with the working copy. Guess I will try command line.

4thSpace 2009-12-03 05:14:26

see link to SCPlugin

Ken Liu 2009-12-07 18:55:42

+1 A:

Try Versions but I don't think they have support for merging. I could be wrong, The best way to do merging would be to use the command-line.

Shiv 2009-12-03 05:12:16

The best way to do merging is to dump svn and use git. ;-)

Matt Long 2009-12-07 19:21:01

ansaurus

tags:

views:

answers:

Mac version control with merge and support

related questions