On Wed, Aug 24, 2011 at 5:01 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> On Wed, Aug 24, 2011 at 03:12:04PM +0200, Erik Faye-Lund wrote:
>> In file
>> 'D:\Development\SVN\Releases\TortoiseSVN-1.7-beta2\ext\subversion\subversion\libsvn_wc\update_editor.c'
>> line 1582: assertion failed (action == svn_wc_conflict_action_edit || action
>> == svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace)
>> ---------------------------
>> OK
>> ---------------------------
>> ---8<---
>>
>> I don't know the code-base, but my knee-jerk instinct was that I did
>> have local modifications in some of the files; luckily these were pure
>> throw-away things. So after a clean-up and revert I updated again, and
>> everything seems to be in order again.
>
> This is definitely something related to tree conflicts.
> You must have had a locally edited, deleted, or replaced node.
> The incoming change was something other than an edit, delete,
> or replace.
But shouldn't that have been solved by a revert in that case? Because
it still triggers when I revert and re-update here...
> If you can still manage to produce a reproduction recipe based on this
> information please share it! Thanks.
Unfortunately, the repo is proprietary, and I don't know how I can
re-create the issue outside of my corporate setup...
Received on 2011-08-25 11:53:01 CEST