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

Re: Tree conflict bug?

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 29 Oct 2008 12:38:50 -0400

On Wed, Oct 29, 2008 at 12:18 PM, Stephen Butler <sbutler_at_elego.de> wrote:
>> So what
>> do I do here? I guess maybe svn resolve would have done the right
>> thing?
>
> We haven't hooked up tree conflicts into the interactive conflict
> resolution yet. 'svn resolved' will remove the tree conflict from
> the file and allow the update to proceed.

So "will" means in the future, not right now? I cannot seem to get it
to do anything.

Setting aside interactive resolution, I was OK with how update ran in
general. I just do not see how to get rid of this file from my WC.

>> I did svn revert and the bug I am reporting is that this left
>> ColorManager.java in my WC with a status of "Normal". So I edited the
>> file and tried to commit and of course get the message that the file
>> does not exist. So the bug is that the WC was not handled properly.
>>
>> My expectation was that svn revert would leave the file in the WC in
>> an Unversioned status.
>
> The incoming deletion of ColorManager.java was skipped due to the
> tree conflict. 'svn info -uv' should show that ColorManager.java
> is still at the old BASE version, and that it has incoming changes.

-u is not an option for svn info.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
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-29 17:39:08 CET

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