[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: Stephen Butler <sbutler_at_elego.de>
Date: Wed, 29 Oct 2008 17:50:13 +0100

Quoting Mark Phippard <markphip_at_gmail.com>:

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

We're changing the tree conflict code to use the victim path in all
cases (earlier, we used the parent path to show status, info, etc.)
On trunk right now, 'svn resolved' still needs the parent path as
its argument. I'll fix that.

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

Whoops, I meant 'svn status -uv'.


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-29 17:50:32 CET

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