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

Re: Tree conflicts - high-priority User Interface tasks

From: Neels J. Hofmeyr <neels_at_elego.de>
Date: Tue, 21 Oct 2008 04:54:20 +0200

Julian Foad wrote:
> Here are some high-priority UI tasks for getting tree conflict handling
> to a releasable state.
>
> * "svn status" must be able to print "tree conflict" status on a
> victim that is not a versioned item in the WC (which happens when
> merging a deletion into a branch where the item was deleted earlier or
> never existed).

taking this one. 'right?

>
> * "svn status" must not print "C" on the parent.
> (That's easy apart from loads of Python tests to adjust.)

and this one. scream if you're doing it already.

>
> * There must be a way to use "svn merge" to merge a required change
> into a WC to resolve a tree conflict. (The merge currently fails if
> there is any conflict already flagged, which is usually the desired
> behaviour, but not when you're trying to resolve a conflict and need to
> use a merge.)
>
> * Notifications from "update", "switch", "merge" need to show "C" on
> the victim in a new column, rather than "C" on the parent in the first
> column.
>
> - Julian
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: dev-help_at_subversion.tigris.org
>

-- 
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696  mobile: +49 177 2345869  fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194

Received on 2008-10-21 04:54:40 CEST

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