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

Re: [PATCH] Correct use of notification baton during update.

From: <kfogel_at_collab.net>
Date: 2004-03-29 23:36:50 CEST

"Max Bowsher" <maxb@ukf.net> writes:
> Currently, "svn up target1 target2 target3" sometimes produces misleading
> messages. Once one target has received changes, all following targets will
> show the message "Updated to revision rxxx" not "At revision rxxx", even if
> they have *not* been updated. This is because
> notify_baton.received_some_change is set but never reset. This can be solved
> by only using a notify_baton for one call to svn_client_update.
>
> * subversion/clients/cmdline/update-cmd.c (svn_cl__update): Reduce the
> lifetime
> of a notify_baton to a single call of svn_client_update.

Looks utterly sane to me. I assume this passes the tests; +1 to
commit.

-Karl

> Index: subversion/clients/cmdline/update-cmd.c
> ===================================================================
> --- subversion/clients/cmdline/update-cmd.c (revision 9226)
> +++ subversion/clients/cmdline/update-cmd.c (working copy)
> @@ -61,10 +61,6 @@
> targets,
> pool));
>
> - if (! opt_state->quiet)
> - svn_cl__get_notifier (&ctx->notify_func, &ctx->notify_baton, FALSE,
> FALSE,
> - FALSE, pool);
> -
> for (i = 0; i < condensed_targets->nelts; i++)
> {
> const char *target = ((const char **) (condensed_targets->elts))[i];
> @@ -73,6 +69,10 @@
> svn_pool_clear (subpool);
> SVN_ERR (svn_cl__check_cancel (ctx->cancel_baton));
>
> + if (! opt_state->quiet)
> + svn_cl__get_notifier (&ctx->notify_func, &ctx->notify_baton, FALSE,
> FALSE,
> + FALSE, subpool);
> +
> err = svn_client_update (NULL, target,
> &(opt_state->start_revision),
> opt_state->nonrecursive ? FALSE : TRUE,
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 30 00:48:04 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.