Hi,

During my tests to reproduce my tree conflict, I found an assertion failure in 
svn.exe:

D:\TreeConflict>svn status wc
svn: E235000: In file 
'D:\Development\SVN\Releases\TortoiseSVN-1.7.4\ext\subversion\subversion\svn\status.c'
 line 200: assertion failed (tree_conflict != NULL)

I attached the windows batch file which reproduces the problem. 



Best regards

Markus Schaber
-- 
___________________________
We software Automation.

3S-Smart Software Solutions GmbH
Markus Schaber | Developer
Memminger Str. 151 | 87439 Kempten | Germany | Tel. +49-831-54031-0 | Fax 
+49-831-54031-50

Email: m.scha...@3s-software.com | Web: http://www.3s-software.com 
CoDeSys internet forum: http://forum.3s-software.com
Download CoDeSys sample projects: 
http://www.3s-software.com/index.shtml?sample_projects

Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade 
register: Kempten HRB 6186 | Tax ID No.: DE 167014915 


svnadmin create repo

svn checkout file:///%CD%/repo wc

mkdir wc\folder

rem We need to get a binary file from somewhere.
copy c:\windows\system32\cmd.exe wc\folder\file

svn add wc\folder

svn propset foo foo wc\folder\file

svn commit -m "added folder" wc

svn rm wc\folder\file wc\folder

svn commit -m "removed folders again" wc

mkdir wc\folder

rem We need to get a binary file from somewhere.
copy c:\windows\system32\notepad.exe wc\folder\file

svn add wc\folder

svn propset foo foo wc\folder\file

svn commit -m "added folder again" wc

svn update -r2 wc\folder

rem svn rm wc\folder\file wc\folder

mkdir wc\folder

copy c:\windows\system32\xcopy.exe wc\folder\file

svn add wc\folder

svn propset bar bar wc\folder\file

svn update --accept p --depth=files wc\folder\file wc\folder 

svn status wc

Reply via email to