subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Markus Schaber <m.scha...@3s-software.com>
Subject AW: Problem with reverting
Date Thu, 02 Feb 2012 13:42:46 GMT
Hi, Philip,

Von: Philip Martin [mailto:philip.martin@wandisco.com] 
Markus Schaber <m.schaber@3s-software.com> writes:

>>> Can you describe in detail how the tree conflict came about?
>>
>> I tried to create a self-contained example, but it seems that, in 
>> those examples, the conflict comes out differently, I cannot get the 
>> tree conflict to appear.

> I added an example to the issue:
> http://subversion.tigris.org/issues/show_bug.cgi?id=4109
> Is that the problem you are seeing?

It seems similar, but the difference in my case is that A/B is a file, not a directory.

But your code helped me to modify my script to really reproduce the issue. I attached it to
the bug report.


As a side note:
I tried to reproduce the problem, and in step 4 I got:

D:\TreeConflict\batch>svn co file://%CD%/repo@1 wc
svn: E235000: In file 'D:\Development\SVN\Releases\TortoiseSVN-1.7.4\ext\subversion\subversion\libsvn_client\checkout.c'
line 94: assertion failed (svn_uri_is_canonical(url, pool))

AFAIR, this or a similar one was discussed a few days ago on the mailing list, so it might
already be fixed in trunk. When inserting the URL by hand (file:///D:/TreeConflict/repo),
it works fine.

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.schaber@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 

Mime
View raw message