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

2014-08-22 Thread Stefan Sperling
On Fri, Aug 22, 2014 at 12:26:12PM +0200, Bert Huijben wrote: > > I'm not sure this should even be flagged as a conflict. > > However, the victim node kind is wrong. > > I think it should say local file delete, ... > (but local, left-src and right-src are all victims) As already mentioned on IRC

RE: svn commit: r1619717 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

2014-08-22 Thread Bert Huijben
> -Original Message- > From: Stefan Sperling [mailto:s...@elego.de] > Sent: vrijdag 22 augustus 2014 11:51 > To: dev@subversion.apache.org > Subject: Re: svn commit: r1619717 - > /subversion/trunk/subversion/libsvn_wc/conflicts.c > > On Fri, Aug 22, 2014 at

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

2014-08-22 Thread Stefan Sperling
On Fri, Aug 22, 2014 at 09:29:27AM -, rhuij...@apache.org wrote: > Author: rhuijben > Date: Fri Aug 22 09:29:27 2014 > New Revision: 1619717 > > URL: http://svn.apache.org/r1619717 > * subversion/libsvn_wc/conflicts.c > (read_tree_conflict_desc): >