Re: svn commit: r961254 - in /subversion/trunk/subversion: include/private/svn_wc_private.h libsvn_client/cat.c libsvn_client/client.h libsvn_client/merge.c libsvn_wc/questions.c

On Fri, Feb 17, 2012 at 01:47:59AM +0100, Stefan Sperling wrote:
> On Fri, Feb 17, 2012 at 01:16:36AM +0100, Stefan Sperling wrote:
> > On Wed, Jul 07, 2010 at 06:44:27AM -0000, hwright_at_apache.org wrote:
> > > Author: hwright
> > > Date: Wed Jul 7 06:44:26 2010
> > > New Revision: 961254
> > >
> > > URL: http://svn.apache.org/viewvc?rev=961254&view=rev
> > > Log:
> > > Remove a hacky use of a libsvn_wc function, by reusing some existing
> > > libsvn_client code.
> > >
> >
> > It seems that this commit caused issue #4052 ("reintegrate merge and
> > deleted symbolic links"). The svn_wc__versioned_file_modcheck() function
> > handled symlinks differently (via compare_and_verify()). As of this change
> > we fail to compare symlinks with one another and raise a tree-conflict
> > when deleting a symlink in libsvn_client/merge.c:merge_file_deleted().
>
> Running tests on this rather simple patch now.
> It makes the issue #4052 test happy, at least.

Tests are passing. Committed.
Received on 2012-02-17 02:43:46 CET