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

Re: Subversion in 2010

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 4 Jan 2010 18:25:05 +0000

On Mon, Jan 04, 2010 at 01:01:14PM -0500, Mark Mielke wrote:
> Again, I appreciate the unique difficulties that the Subversion
> architecture introduces, and I appreciate the efforts done so far -
> merge tracking in 1.5, tree conflict resolution in 1.6 - but this
> area still needs work.

I'd be really happy if we already had tree conflict resolution!
Right now, Subversion can *detect* tree conflicts, but it is far
from resolving any of them automatically.

Stefan
Received on 2010-01-04 19:25:56 CET

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