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

Re: svn commit: r927412 - /subversion/trunk/subversion/libsvn_client/export.c

From: Greg Stein <gstein_at_gmail.com>
Date: Thu, 25 Mar 2010 10:53:02 -0400

Please revert. I'm working on fixing this properly.

On Thu, Mar 25, 2010 at 10:10, <stylesen_at_apache.org> wrote:
> Author: stylesen
> Date: Thu Mar 25 14:10:11 2010
> New Revision: 927412
>
> URL: http://svn.apache.org/viewvc?rev=927412&view=rev
> Log:
> Follow up r921604. Fix failing export test 11.
>
> * subversion/libsvn_client/export.c
>  (copy_one_versioned_file): Include the if condition to check for
>   added and replaced files, since source value is unreliable.
>
> Modified:
>    subversion/trunk/subversion/libsvn_client/export.c
>
> Modified: subversion/trunk/subversion/libsvn_client/export.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/export.c?rev=927412&r1=927411&r2=927412&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_client/export.c (original)
> +++ subversion/trunk/subversion/libsvn_client/export.c Thu Mar 25 14:10:11 2010
> @@ -157,14 +157,14 @@ copy_one_versioned_file(const char *from
>
>          Copied-/moved-here nodes have a base, so export both added and
>          replaced files when they involve a copy-/move-here.
> +      */
> +      if ((entry->schedule == svn_wc_schedule_add
> +           || entry->schedule == svn_wc_schedule_replace)
> +          && !entry->copied)
> +        return SVN_NO_ERROR;
>
> -         We get all this for free from evaluating SOURCE == NULL:
> -       */
>       SVN_ERR(svn_wc_get_pristine_contents2(&source, wc_ctx, from_abspath,
>                                             scratch_pool, scratch_pool));
> -      if (source == NULL)
> -        return SVN_NO_ERROR;
> -
>       SVN_ERR(svn_wc_get_prop_diffs2(NULL, &props, wc_ctx, from_abspath,
>                                      scratch_pool, scratch_pool));
>     }
>
>
>
Received on 2010-03-25 15:53:32 CET

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