Alex Rivera | Logout

What is a good, non-distributed, alternative to subversion that has excellent branching and merging support?

Asked 2008-09-16T04:56:28.607
9

I'm sick and tired of manually tracking my branches and merges across my repository! It's too error prone. In a world where everyone seems to get the idea of reducing duplication and automating everything, subversion branching/merging feels like it's left over from the 80's. What is a good alternative to subversion that has excellent branching and merging support without adding the complexity of a distributed SCM paradigm? Ideally it would be free, but if I have to shell out some cash I might be inclined if it's good enough.

svn version-control branch merge
Edit
Report

4 Answers

26

Have you upgraded to Subversion 1.5? It includes automated merge tracking. This may address your issue. It sounds like you're already familiar with the tool itself and it's free. So, if you upgrade your current solution to 1.5 you'll have almost no learning curve and zero cost - plus you won't have to go through the pain of porting your existing code to a new source code control system.

answered 2008-09-16T05:15:01.713
6

Perforce is an excellent tool, but beyond 2 users it will cost you as it's aimed at professionals. We use it with a pretty heavy branching scheme (1 branch per feature during main development) and it works well. Kind of like the "Spider web" branching used by Microsoft (which used a modified older version of Perforce), but I can't find the story online now.

answered 2008-09-16T04:59:22.563
1

One thing that hasn't been mentioned yet is that it's perfectly possible to use git in the same centralized manner that you're used to with Subversion. It really is an outstanding piece of software.

answered 2008-09-16T14:19:31.327
-1

Bazaar, by the creators of Ubuntu.

http://bazaar-vcs.org/

Why Choose Bazaar?

http://bazaar-vcs.org/BzrWhy

answered 2008-09-16T07:13:37.297

Your Answer