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

Re: resolving tree conflicts

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 13 Jul 2009 17:42:23 +0100

On Mon, Jul 13, 2009 at 05:37:47PM +0100, James French wrote:
> Thanks for the detailed explanation. However, I disagree that the
> reorg shouldn't have been on the branch. Sure, the merge I'm doing now
> is unpleasant, but once its down future traffic should be easy. If it
> was the other way round we'd have to cope with it over and over again.
>
> Boy am I looking forward to when svn can cope better with this! Any
> hints when this might happen?

Not until some time after 1.7.

Stefan
Received on 2009-07-13 18:43:33 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.