[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: Tue, 21 Oct 2008 14:44:33 +0100

On Mon, 2008-10-20 at 22:08 +0200, Daniel Shahaf wrote:
> Julian Foad wrote on Mon, 20 Oct 2008 at 15:46 +0100:
> > [[[
> > $ 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
> > ]]]
> >
>
> What additional information does the 'C' column provide? (It's already
> clear that a node is in tree conflict because it has the little arrow.)

In this case, it doesn't provide more info. The idea is that the first
three colums repeat the "Text status, Prop status, Tree conflict status"
fields from a normal "svn status", and then the part in parentheses
gives more info.

Maybe the tree-conflict 'C' column is redundant, or maybe in the general
case where different kinds of conflict shown it would be useful.

- Julian

> > Here, "(D>M)" means "an incoming Delete onto an existing Modified node".
> >
> > 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.

---------------------------------------------------------------------
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-21 15:45:01 CEST

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