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

Re: svn commit: r1667280 - in /subversion/trunk/subversion: libsvn_wc/merge.c tests/cmdline/merge_tests.py

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 19 Mar 2015 11:31:09 +0100

On Thu, Mar 19, 2015 at 10:19:18AM +0100, Stefan Sperling wrote:
> I agree with Daniel's point that resolving to 'mine-full' is not the same as
> resolving to 'working'. Else, why do we even have these two different options?
> Perhaps the answer is to stop offering 'mine-full' for binaries, since SVN
> does not preserve the pre-update state which corresponds to 'mine-full',
> and never did.

See r1667691 and r1667692. Is this better?
Received on 2015-03-19 11:32:43 CET

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