[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: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 20 Oct 2008 19:57:06 +0100

On Mon, 2008-10-20 at 19:01 +0100, Stefan Sperling wrote:
> 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).

Heh. Sure. Yes, that's what it means.

I was wondering if we could include revision numbers of the changes:

  (D r34567 -> M r34567)

(I'd have to think about whether we're printing old/new/theirs/mine or
what exactly)

and/or whether we could include text-mod and prop-mod indicators in each
position:

  (D_ -> _M) foo # meaning: delete conflicted with prop-mod

to be more precise. Especially as the non-tree conflict indication could
then be similar:

  (MM -> _M) foo # meaning: text applied ok, prop mod conflicted

Or something like that.

We aren't perhaps storing enough details of the tree conflict at the
moment to be that precise.

> 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.

I don't want to spend much time thinking about how to represent non-tree
conflicts right now, but I'll make that the eventual aim.

> > 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.

Yes.

- Julian

---------------------------------------------------------------------
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:57:21 CEST

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