Re: [PATCH v4] - issue 3342 summary of conflicts and skips

Ping!
This patch hasn't received any attention in a couple of days.

Sorry about the diff headers. Tigris concatenates some line in the diffs
for me. (I blame tigris for everything :-))

Mvh
Daniel

> Thanks! My python is a bit rusty (hrm now I know some).
>
> Make check passed but with two failures in basic_tests.py. When skipping
> no summary was printed before. That was caused by theese lines in
> subversion/libsvn_client/update.c:
>
> 344 err = svn_client__update_internal(&result_rev, path, revision, depth,
> 345 depth_is_sticky, ignore_externals,
> 346 allow_unver_obstructions,
> 347 &sleep, TRUE, ctx, subpool);
> 348 if (err && err->apr_err != SVN_ERR_WC_NOT_DIRECTORY)
> 349 {
> 350 return svn_error_return(err);
> 351 }
> 352 else if (err)
> 353 {
> 354 /* SVN_ERR_WC_NOT_DIRECTORY: it's not versioned */
> 355 svn_error_clear(err);
> 356 err = SVN_NO_ERROR;
> 357 result_rev = SVN_INVALID_REVNUM;
> 358 if (ctx->notify_func2)
> 359 (*ctx->notify_func2)(ctx->notify_baton2,
> 360 svn_wc_create_notify(path,
> 361 svn_wc_notify_skip,
> 362 subpool), subpool);
> 363 }
>
> A svn_wc_notify_skip was sent after the svn_wc_notify_update_completed.
> But now when the summary is not printed in response to an update
> completed notification but after the call to svn_client_update3 a
> summary will be printed even if the only action is skipping one
> directory. Since the summary includes a line for skips I think that the
> test should be changed and has done so. The patch now passes make
> check.
 
  [[[
  Fix issue #3342: Summary of conflicts printed at end of up/sw/merge
  * subversion/svn/merge-cmd.c
    (svn_cl__merge): Call svn_cl__print_conflict_stats.
 
  * subversion/svn/cl.h
    (svn_cl__print_conflict_stats): Declare.
 
  * subversion/svn/update-cmd.c
    (svn_cl__update): Call svn_cl__print_conflict_stats.
 
  * subversion/svn/switch-cmd.c
    (svn_cl__switch): Call svn_cl__print_conflict_stats.
 
  * subversion/svn_notify.c
    (svn_cl__print_conflict_stats): Changed name from print_conflict_stats.
 
  * subversion/svn_notify.c
    (notify): Remove references to print_conflict_stats. Do not clear
     counters for conflicts.
 
  * subversion/tests/cmdline/basic_tests.py
    (basic_update): Changed tests involving skipping to include summary.
  ]]]
 
 Mvh
 Daniel Näslund