Re: another hole in tree-conflicts!

2010-05-11 Thread Julian Foad
ng mergeinfo for merge of r3 into 'trunk': > U trunk > Summary of conflicts: > Tree conflicts: 1 > + svn info trunk/foo.c > Path: trunk/foo.c > Name: foo.c > Node Kind: none > Tree conflict: local delete, incoming delete upon merge > Source left: (file) file

Re: another hole in tree-conflicts! -- was: Re: svn commit: r940111 - in /subversion/trunk/subversion: include/private/svn_wc_private.h include/svn_wc.h libsvn_wc/node.c libsvn_wc/status.c svn/cl.h

2010-05-05 Thread Stefan Sperling
local delete, incoming delete upon merge > Summary of conflicts: > Tree conflicts: 1 > ]]] > > Good grief, another hole in tree-conflicts! It says it was locally deleted > and status '!', but it never existed locally. It should rather say something > like.

RE: another hole in tree-conflicts! -- was: Re: svn commit: r940111 - in /subversion/trunk/subversion: include/private/svn_wc_private.h include/svn_wc.h libsvn_wc/node.c libsvn_wc/status.c svn/cl.h

2010-05-05 Thread Bert Huijben
> -Original Message- > From: Neels J Hofmeyr [mailto:ne...@elego.de] > Sent: woensdag 5 mei 2010 11:37 > To: dev@subversion.apache.org; Julian Foad; Stefan Sperling; Stephen > Butler > Subject: another hole in tree-conflicts! -- was: Re: svn commit: > r940111 -

another hole in tree-conflicts! -- was: Re: svn commit: r940111 - in /subversion/trunk/subversion: include/private/svn_wc_private.h include/svn_wc.h libsvn_wc/node.c libsvn_wc/status.c svn/cl.h svn/

2010-05-05 Thread Neels J Hofmeyr
n merge Source left: (file) file:///tmp/trunk.EKH/repos/branch/fo...@2 Source right: (file) file:///tmp/trunk.EKH/repos/branch/fo...@3 + svn status trunk M trunk ! C trunk/foo.c > local delete, incoming delete upon merge Summary of conflicts: Tree conflicts: 1 ]]] Good