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

Re: svn: E235000: error when performin a svn switch with SVN 1.7.4

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Wed, 18 Apr 2012 09:23:54 +0100

Philip Martin <philip.martin_at_wandisco.com> writes:

> Philip Martin <philip.martin_at_wandisco.com> writes:
>
>> Please describe the changes made by the switch. Running
>>
>> svn diff --summarive URL_OF_WC URL_OF_SWITCH_TARGET
>>
>> may help.
>
> I think I may have identified it:
>
> svnadmin create repo
> svn import repo/format -mm file://`pwd`/repo/A/f
> svn co file://`pwd`/repo wc
> ln -s f wc/A/g
> svn add wc/A/g
> svn ci -mm wc
> svn pd svn:special wc/A/g
> rm wc/A/g
> touch wc/A/g
> svn ci -mm wc
> svn up wc
> svn up -r2 wc
> svn: E235000: In file '../src-1.7/subversion/libsvn_wc/update_editor.c' line 1583: assertion failed (action == svn_wc_conflict_action_edit || action == svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace)
>
> The problem is a file that gains or loses svn:special, thus changing to
> or from a symlink, without the node being replaced.

An ugly workaround is to delete the problem file to provoke a tree
conflict:

svn cleanup wc
svn rm wc/A/g
svn up -r2
svn revert wc/A/g

This does require that you identify the problem file.

-- 
Philip
Received on 2012-04-18 10:24:34 CEST

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