subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Philip Martin <philip.mar...@wandisco.com>
Subject Re: assert triggered in update_editor.c
Date Mon, 05 Dec 2011 14:02:01 GMT
Ivo Schenk <ivo.schenk@delphin.de> writes:

> Erik Faye-Lund <kusmabite <at> gmail.com> writes:
>
>
>> In file
>> 
> 'D:\Development\SVN\Releases\TortoiseSVN-1.7-beta2\ext\...
>>  line 1582: ...
>> ---------------------------
>
>
> Same with SVN 1.7.1 (Tortoise 1.7.1 or Subclipse 1.8.0)
>
>
> Updating '.':
> svn: E235000: In file 
> 'D:\Development\SVN\Releases\TortoiseSVN-1.7.1\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)
>
>
> This assert can be triggered triggered, when in a directory 
> one file is deleted,
> one file is added 
> and a SymLink changes:

Fixed in 1.7.2:

------------------------------------------------------------------------
r1203778 | hwright | 2011-11-18 18:12:30 +0000 (Fri, 18 Nov 2011) | 14 lines

Merge r1186944, r1186981, r1186983, r1187676 from trunk:

 * r1186944, r1186981, r1186983, r1187676
   Fix an assertion failure when a symlink is updated.


-- 
Philip

Mime
View raw message