Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

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

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.

like image 212
Jason Citron Avatar asked Sep 16 '08 04:09

Jason Citron


People also ask

What is SVN alternative?

Git, Mercurial, DVC, Plastic SCM, and Magit are the most popular alternatives and competitors to SVN (Subversion).

Does SVN support branching?

Subversion Branching StrategiesSubversion branches (SVN branches) allow your team to work on multiple versions of your code simultaneously. Developers can test out new features without impacting the rest of development with errors and bugs. SVN's “branch” directory runs parallel to the “trunk” directory.

Is Git really better than SVN?

Many people prefer Git for version control for a few reasons: It's faster to commit. Because you commit to the central repository more often in SVN, network traffic slows everyone down. Whereas with Git, you're working mostly on your local repository and only committing to the central repository every so often.

Is SVN centralized or distributed?

Subversion (SVN) Is a Distributed Version Control System? SVN is actually a centralized version control system. It's different from distributed systems, like Git.


2 Answers

Did you ever ask yourself why you have so many branch/merge operations? Is there a way to simplify your development process?

Subversion, IMHO, is a good application of the KISS (Keep it simple, stupid) principle. Translation: In my experience you will get a far greater productivity boost from streamlining your development process than from getting a more complex tool.

like image 111
user11087 Avatar answered Oct 12 '22 23:10

user11087


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.

like image 42
Joe Barone Avatar answered Oct 13 '22 00:10

Joe Barone