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

Re: [RFC] UI to show a summary of problems after merge etc. (incl. tree conflicts)

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 20 Oct 2008 19:01:05 +0100

On Mon, Oct 20, 2008 at 03:46:29PM +0100, Julian Foad wrote:
> The UI is up for comment - both the command line to invoke it, and the
> output.
>
> [[[
> $ svn st
> C A/D/G
> ? C A/D/G/rho
> D C A/D/G/pi
>
> $ svn st --conflicts)
> ? C (D>M) A/D/G/rho
> D C (M>D) A/D/G/pi
> ]]]
>
> Here, "(D>M)" means "an incoming Delete onto an existing Modified node".

I'd prefer (D->M), since this provides a more recognisable image
of an arrow (which I think your > is supposed to allude to).

I like the idea of parentheses, since it visually groups the details
about tree conflicts, and makes them stand. If they were just letters
in yet another column, it would not be as easy to parse.

> In this patch, this indication is coded on the assumption that it's a
> tree conflict, but I feel the command ought to show all kinds of problem
> mentioned above.

Yes.

> Note also that a briefer summary of such problems has just been
> implemented as a message at the end of an update/switch/merge command.
> This ought to be complementary to that.

Maybe the summary should also print a last line saying something like
"Run 'svn status --conflicts' for more information", once the UI is set
in stone.

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-20 20:01:31 CEST

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