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

Re: [PATCH] fix conflict stats for externals during update

From: Julian Foad <julian.foad_at_wandisco.com>
Date: Wed, 24 Feb 2010 10:15:02 +0000

Stefan Sperling wrote:
> conflict stats don't seem to be printed for externals during update.

Do you know if that was working before? Could it be caused by recent
changes in libsvn_wc, which might possibly have changed or lost the
final "update (of externals) is complete" notification?

> I think the new 'svn status' summary does what we want -- it prints
> the summary for the entire operation, including externals.
> With the patch below, the update output changes to:
> + svn up --accept=postpone conflict-stats-externals/trunk2
> C conflict-stats-externals/trunk2/alpha
> Fetching external item into 'conflict-stats-externals/trunk2/ext'
> C conflict-stats-externals/trunk2/ext/zeta
> Updated external to revision 5.
> Updated to revision 5.
> Summary of conflicts:
> Text conflicts: 2
> Any objections? Does anyone remember what the rationale was for
> treating externals separately?

+1 on the change, whether it was broken or not. The whole idea was to
print a summary at the end of the output. I don't think there is enough
extra value in printing the summaries separately for each external, even
if those summaries were all printed at the very end of the output.

- Julian

> I haven't run this through make check yet.
> Stefan
Received on 2010-02-24 11:15:41 CET

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