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

Re: [PATCH] print conflict statistics after update/merge

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Fri, 17 Oct 2008 17:57:30 +0200 (Jerusalem Standard Time)

> + if (nb->had_print_error)
> + return SVN_NO_ERROR;

The docstring of 'had_print_error' says it's for error messages, not for
informational messages.

> + ? _("%i path was skipped.\n")

The %i format isn't for unsigned ints. :)

> @@ -305,7 +429,13 @@ notify(void *baton, const svn_wc_notify_t *n, apr_
> }
> }
> }
> + if ((err = print_conflict_stats(nb, pool)))
> + goto print_error;
> + /* Reset conflict stats. */
> + nb->text_conflicts = nb->prop_conflicts = nb->tree_conflicts
> + = nb->skipped_paths = 0;
> }
> +

This is the block of svn_wc_notify_update_completed. Its docstring says
it also fires for externals. Have you tested with externals?

> if (nb->in_external)
> {
> nb->in_external = FALSE;

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-17 17:57:49 CEST

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