Re: Tree conflicts - What's To Do?

Quoting Neels J Hofmeyr <neels_at_elego.de>:

>
>
> Stephen Butler wrote:
>>>> - Update and switch need to skip the final "cleanup" (setting the new
>>>> revision, URL, etc) of items inside a tree-conflicted dir.
>>>
>>> (don't know)
>>
>> Fixed.
>>
>>>
>>>>
>>>> - Running 'svn status -u' fails (instead of showing '*' for pending
>>>> update) when a switched item does not exist in the repo.
>>>> Apparently
>>>> due to the shoulda-skipped-cleanup bug above.
>>>
>>> (don't know)
>>
>> Also fixed.
>
> You say fixed, but I see no commits from you today or in the last few days.
> So you're saying you checked and the problems aren't happening anymore?
>
> ~Neels
>
>

The shoulda-skipped-cleanup issue was fixed in r34158 and 34209. Which
seems to have fixed the second (status) problem, though I didn't look
too closely.

Steve

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