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

Re: Tree-conflicts branch - log message / review

From: Stephen Butler <sbutler_at_elego.de>
Date: Wed, 20 Aug 2008 17:32:06 +0200

Quoting Julian Foad <julianfoad_at_btopenworld.com>:

> On Wed, 2008-08-20 at 10:58 +0100, Julian Foad wrote:
>> Here is a log message for the changes currently sitting on the
>> tree-conflicts branch.


>> * subversion/svn/schema/status.rnc
>> (attlist.wc-status): Add a flag for the whether a directory has tree
>> conflicts.
>> ### Want to change this to per-victim flags.

There's a UI design issue here, due to a lack of space in the user
interface. The output of 'svn status' (in this branch) prints 'C' in
the first column of a directory's status if it contains tree conflict
victims. For a file victim, 'C' in the first column is already used
for text conflicts.

There is a priority for use of that first column, in the case that
more than one status applies to an item. Obstructed/missing/incomplete
and added/deleted/replaced are higher priority than a text conflict.
Only modified is lower. (see libsvn_wc/status.c)

I think a tree conflict should have a higher priority than added et al.,
because we want a tree conflict to block an update, switch or merge
operation (when not using --force). We want to make it obvious that
the tree conflict exists. Perhaps even a higher priority than
obstructed et al., though I'm not sure of that yet.

Also, we need to choose a letter. T and C are already in use. How
about E?

With per-victim flags, the output of the update, switch, merge, info
and status commands would have to change, as well as these .rnc files,
the function svn_wc_conflicted_p2() in libsvn_wc, etc.. I'm sure we
can handle these details after we sort out the UI issue.

(I'll add a few comments about tests, too, in another mail.)


Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-20 17:32:23 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.