Re: svn commit: r1488183 - /subversion/trunk/subversion/libsvn_client/merge.c

2013-06-05 Thread Ivan Zhakov
On Wed, Jun 5, 2013 at 1:50 AM, Julian Foad wrote: > Paul Burba wrote: >> On Fri, May 31, 2013 at 8:02 AM, wrote: >>> URL: http://svn.apache.org/r1488183 >>> >>> --- subversion/trunk/subversion/libsvn_client/merge.c (original) >>> +++ subversion/trunk/subversion/libsvn_client/merge.c Fri May 31

Re: svn commit: r1488183 - /subversion/trunk/subversion/libsvn_client/merge.c

2013-06-04 Thread Julian Foad
Paul Burba wrote: > On Fri, May 31, 2013 at 8:02 AM,  wrote: >> URL: http://svn.apache.org/r1488183 >> >> Modified: subversion/trunk/subversion/libsvn_client/merge.c >> == >> --- subversion/trunk/subversion/libsvn_client/

Re: svn commit: r1488183 - /subversion/trunk/subversion/libsvn_client/merge.c

2013-06-04 Thread Paul Burba
On Fri, May 31, 2013 at 8:02 AM, wrote: > Author: ivan > Date: Fri May 31 12:02:32 2013 > New Revision: 1488183 > > URL: http://svn.apache.org/r1488183 > Log: > Validate target working copy for mixed revisions, local modifications and > switched subtrees before contacting server. Mixed revision w