It's Time to Fix Subversion Merge

[justice]

This month we launched a project to fix Subversion merge.  Subversion fills a need for simplicity and team synchronization.  It also has an advantage handling large files and repositories.  However, there is one thing about Subversion that definitely sucks:  Merging.

We've started work with the Apache Subversion team to fix the merge in a way that will be compatible with existing servers and clients.  Once this is released, we will be able to bring great modern workflows to Subversion, including contributor branching and merging, merge requests, code reviews, etc.  We'll future-proof your existing Subversion repository and accelerate your development.

from Assembla blog

[kyrathaba]

Hurray!

[mwb1100]

It took a long time for SVN merge tracking to get added, which was supposed to solve most merge problems.  See http://blog.red-bean.com/sussman/?p=92

I don't have much experience with it yet (my work's SVN repository just got upgraded to support it). It seems to help a lot, but still not be quite enough to make merges pain free.

I wonder how long this effort by Assembla will take (and I see that they're bringing in the WANdisco team to help - after some WANdisco blog entries about tackling this problem themselves caused a major backlash from the SVN community: https://blogs.apache...ersion_to_wandisco_1).

[Deozaan]

Didn't they already fix it a while ago? But they called it something else...  Like Mercurial or Git or something.

[kyrathaba]

Didn't they already fix it a while ago? But they called it something else...  Like Mercurial or Git or something.

Heh!

Good one.

[f0dder]

Didn't they already fix it a while ago? But they called it something else...  Like Mercurial or Git or something.

-Deozaan (July 29, 2011, 07:34 PM)

No no, what they're doing now is the duct-tape-fixing version

[Shades]

SVN 'MacGuyver' edition?

[kyrathaba]

Can (meaning "Is it possible?" not "May I?") I set up my DC ftp account to work with TortoiseSVN?