[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: Stefan Sperling <stsp_at_elego.de>
Date: Sat, 18 Oct 2008 23:52:31 +0100

On Sat, Oct 18, 2008 at 10:18:11PM +0200, Daniel Shahaf wrote:
> Stefan Sperling wrote on Sat, 18 Oct 2008 at 19:11 +0100:
> > On Sat, Oct 18, 2008 at 06:07:19PM +0200, Daniel Shahaf wrote:
> > > Stefan Sperling wrote on Sat, 18 Oct 2008 at 16:04 +0100:
> > > > Conflict stats for externals seem to work fine:
> > >
> > > Yes. It prints just one summary at the end (after updating both the
> > > external and non-external items).
> >
> > No it doesn't. This is the output when the external has no conflicts:
> >
> > $ svn update
> > U gamma/delta
> > C gamma
> > U alpha
> > C .
> >
> > Fetching external item into 'ext'
> > U ext/gamma/delta
> > U ext/alpha
> > Updated external to revision 3.
> > Summary of conflicts:
> > Tree conflicts: 2
>
> What do you mean by "No"? It printed the status for non-externals
> (starting with "gamma/delta"), then the status of externals (starting
> with "ext/gamma/delta"), and then (at the end ) the summary stats.
>
> >
> > Updated to revision 3.

Well, I thought you were expecting something like this instead:

  $ svn update
  U gamma/delta
  C gamma
  U alpha
  C .
  
  Fetching external item into 'ext'
  U ext/gamma/delta
  U ext/alpha
  Updated external to revision 3.

  Updated to revision 3.
  Summary of conflicts:
    Tree conflicts: 2

Note that the summary is at the *very* end.

> > OK?
>
> Looks good.

Great! r33742.

Stefan

---------------------------------------------------------------------
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-19 00:52:50 CEST

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