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

Re: svn commit: rev 5076 - trunk/subversion/libsvn_delta

From: Greg Stein <gstein_at_lyra.org>
Date: 2003-02-25 01:33:45 CET

Is this bug in 0.18? If so, then it seems like we should patch up and
release an 0.18.1.

Cheers,
-g

On Mon, Feb 24, 2003 at 05:03:11PM -0600, striker@tigris.org wrote:
> Author: striker
> Date: 2003-02-24 17:02:52 -0600 (Mon, 24 Feb 2003)
> New Revision: 5076
>
> Modified:
> trunk/subversion/libsvn_delta/diff.c
> Log:
> * subversion/libsvn_delta/diff.c
>
> (svn_diff3): Break the ring created to do the possible conflict resolution,
> bringing the list in its original state. This fixes a looping problem
> reported by cmpilato.
>
>
> Modified: trunk/subversion/libsvn_delta/diff.c
> ==============================================================================
> --- trunk/subversion/libsvn_delta/diff.c (original)
> +++ trunk/subversion/libsvn_delta/diff.c Mon Feb 24 17:02:55 2003
> @@ -820,6 +820,12 @@
> 1, 2,
> subpool2);
>
> + if (position[0])
> + position[0]->next = position_list[1];
> +
> + if (position[1])
> + position[1]->next = position_list[2];
> +
> /* Fix up the EOF lcs element in case one of
> * the two sequences was NULL.
> */
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org

-- 
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Feb 25 01:29:11 2003

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