[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: Stephen Butler <sbutler_at_elego.de>
Date: Tue, 21 Oct 2008 10:54:13 +0200

Quoting "Neels J. Hofmeyr" <neels_at_elego.de>:

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

Sorry for screaming so late. I have a diff that does both of these, plus
the notifications in the 4th item below. I'll send it in a bit, though
it's still rough.

On second thought, first I'll split it into separate status and notify
diffs. They have less common code than I thought they would. Though
it's weird to have intermediate states where expected_output and
expected_status are inconsistent.

Regards,
Steve

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

-- 
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-10-21 10:54:28 CEST

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