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

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

From: Stefan Sperling <stsp_at_elego.de>
Date: Sun, 13 May 2012 13:09:24 +0200

On Sat, May 12, 2012 at 03:27:50PM -0400, Greg Stein wrote:
> It basically is because "everywhere" we check for a recorded text conflict,
> we double-check to see if the conflict files were removed. Removal
> suppresses the conflict.

I still think this is entirely stupid behaviour that just forces us to
write special-case code for text conflicts, but I concede.
See 1337844. Does that look sound?
Received on 2012-05-13 13:10:18 CEST

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