[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: Fri, 31 Oct 2008 17:58:31 +0100

Quoting Mark Phippard <markphip_at_gmail.com>:

> On Fri, Oct 31, 2008 at 1:08 AM, Stephen Butler <sbutler_at_elego.de> wrote:
>> Quoting Mark Phippard <markphip_at_gmail.com>:

>> Here's a funny message that means "out of date". But running
>> svn update again will just re-raise the tree conflict!
>> Carrying out the deletion in the first place would solve
>> the dilemma.
> Just so you know, I was just running some of those commands to show
> that there are no commands you can do to get out of the state.
> Another problem, although I think it is related to the core issue is
> that there is no way to fix your working copy. For example, if I
> revert my whole working copy, when I try to run update again at some
> point I get this:
> Working copy is corrupt
> svn: Attempt to add tree conflict that already exists
> svn: subversion/libsvn_wc/tree_conflicts.c:518: (apr_err=155016)
> So Revert is not removing the tree conflicts from the working copy.

Hi Mark,

I have a simple patch to re-enable the deletion of tree conflict
victims by update/switch.

I believe this will prevent the user from entering the unfixable
wc-state you discovered. Thanks for the recipe.

I'll add the necessary changes to svn revert/resolved so that they
act on t.c. victims directly, like the other commands now do. That
will take care of the recursive-revert bug you mentioned.


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-31 17:58:46 CET

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