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

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?

> (If it wasn't we could remove some expensive code from the status walker)
>
> I can see the reasoning at the time (and the cvs idea), but it is one thing
> I would like to break when we can restore conflicts. But I'm not sure if we
> can.

Why have a 'resolved' command at all if removing these files is the
functional equivalent? It isn't really the technical equivalent since
even 1.6 has to clear conflict data from entries files in any case. All
that happens is that a 'resolved' notification is suppressed if the helper
files are missing from disk. What's the value in that? This is inconsistent
behaviour. And I doubt any of our users are relying on not receiving
this notification.
Received on 2012-05-12 18:55:03 CEST