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

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

From: Greg Stein <gstein_at_gmail.com>
Date: Thu, 8 Apr 2010 13:30:39 -0400

On Thu, Apr 8, 2010 at 08:56, <philip_at_apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_client/merge.c Thu Apr  8 12:56:16 2010
>...
> @@ -9540,47 +9539,44 @@ svn_client_merge_reintegrate(const char
>   svn_boolean_t use_sleep = FALSE;
>   svn_error_t *err;
>   struct get_subtree_mergeinfo_walk_baton wb;
> -  const char *target_abspath;
>   const char *target_url;
>   svn_revnum_t target_base_rev;
>
> -  SVN_ERR(svn_dirent_get_absolute(&target_abspath, target_wcpath, pool));
> -
> -  /* Open an admistrative session with the working copy. */
> -  SVN_ERR(svn_wc__adm_probe_in_context(&adm_access, ctx->wc_ctx,
> -                                       target_abspath,
> -                                       (! dry_run), -1, ctx->cancel_func,
> -                                       ctx->cancel_baton, pool));

Note the DRY_RUN usage there. The old code would not consume a write
lock during a dry run operation.

>...

Cheers,
-g
Received on 2010-04-08 19:31:10 CEST

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