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?