[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: It's time to fix Subversion Merge

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 11 Jul 2011 18:01:10 +0200

On Mon, Jul 11, 2011 at 11:46:11AM -0400, Andy Singleton wrote:
> Many developers are moving from Subversion to other SCM systems
> that have better merge capabilities. I have posted an article with a
> proposal to fix this problem, here:
>
> http://blog.assembla.com/assemblablog/tabid/12618/bid/58122/It-s-Time-to-Fix-Subversion-Merge.aspx
>
> SUMMARY

Interesting ideas, overall.

Have you considered trying to improve the existing merge code to
address specific problems you are having, instead of rewriting
it or making substantial changes? I would guess that such an
approach could lead to improvements much sooner and would carry
less risk of destabilising the existing code base.

Are you aware of the various usability improvements we added to the
merge feature for Subversion 1.7?
See http://subversion.apache.org/docs/release-notes/1.7.html#merge-tracking-enhancements
They might not address all your problems. But I think they are good
examples of smalls steps that can be taken towards a much better
merge experience.

Have you considered how complex situations such as tree conflicts
will affect your design?

I am looking forward to seeing a prototype that implements your ideas.
Please feel free to ask questions on this list during design and
implementation of your prototype.
Received on 2011-07-11 18:01:50 CEST

This is an archived mail posted to the Subversion Dev mailing list.