[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: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Mon, 20 Oct 2008 22:08:48 +0200 (Jerusalem Standard Time)

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

> 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-20 22:09:04 CEST

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