Re: [PATCH] tree conflicts and obstructions

On Thu, Apr 03, 2008 at 01:11:29PM +0530, Senthil Kumaran S wrote:
> Hi Stefan,
>
> Stefan Sperling wrote:
>> here's my first shot at tree conflicts and obstructions.
>>
>> I'm posting this here mainly for review and testing by
>> Julian and Senthil, but if anyone else wants to take a
>> peek, go right ahead :)
>
> I am ok with this patch.

Great :)

> Just for the record am summarizing our IRC conversation here:
>
> As we (stsp, julianfoad and myself) discussed yesterday in IRC, we need to
> have a notification to the user about the tree conflict victim, since
> otherwise it goes unnoticed except for the 'C' notification in the
> (tree)conflicted directory, but the exact files ie., the tree conflict
> victim is not known to the user at a first look, unless he does a 'svn
> info'. Currently it is 'Skipped' in your patch. It can be 'Obstructed'
> during the notification. If that is the case the merge_test 92 should be
> changed accordingly to handle this notification. But there is another
> problem of 'what to show in 'svn status' for these tree conflict victims
> via obstruction.

Thanks for the summary!

I think we should leave all output as it is for now, because changing
it will probably require adjusting a lot of regression tests.

For now I'd like to focus on getting something done that works,
even if it does not look nice. We can always polish up the interface
later. There are still changes in the pipeline for the tree conflicts
branch that will have a major effect on the conflict detection code,
e.g. directories support, 'svn resolved' changes, and possibly
honouring of properties. See the tree conflicts issue list, which
can be retrieved by putting "tree-conflicts" (without the quotes!)
into the "URL:" field of the issue tracker query form.
http://subversion.tigris.org/issues/query.cgi

We should concentrate on getting those changes done before doing any
further UI adjustments, IMHO.

-- 
Stefan Sperling <stsp_at_elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner