Re: svn commit: r1337579 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

On May 12, 2012 6:54 AM, "Stefan Sperling" <stsp_at_elego.de> wrote:
>
> On Sat, May 12, 2012 at 06:38:53PM +0200, Bert Huijben wrote:
> > > Might be, but it only affects notification. And I don't think it is
> > > a good idea to give users the illusion that a conflict can be marked
> > > resolved by removing the temp helper files (which is apparently what
> > > this was about).
> >
> > This is documented behavior since 1.0 :(
>
> Where and how is it documented?

Who knows. Doesn't matter. It has always been one way to resolve text
conflicts.

It has to stay, or you're talking about a regression.

Cheers,
-g
Received on 2012-05-12 21:18:32 CEST