You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "Stein, Ruben" <ru...@mevis.fraunhofer.de> on 2012/02/14 13:23:08 UTC

Assertion in merge.c failed while merging

Hello,

I just got the following message from Tortoise-SVN 1.7.4:

[Š]TortoiseSVN-1.7.4\ext\subversion\subversion\libsvn_client\merge.c'
line 2935: assertion failed (SVN_IS_VALID_REVNUM(rev_primary_url_deleted))

I was trying to continue with a merge operation. I am merging a range of
revisions from one branch's subtree to another one's corresponding
subtree. After merging the first revision-range, Tortoise requested me to
resolve any conflicts encountered so far. I did so and re-ran the merge
operation. It started downloading about 100MB (may be sensible respecting
the amount of revisions to be merged) without showing any changes and then
suddenly showed the above described error.

After this, I did a clear on the entire subtree I wanted to merge and
retried the merge operation. The problem is reproducible and occurs again
after the same amount of downloaded data.

I will try to do the merge in smaller intervals to test if I can localize
the problem in a specific version.

Regards, Ruben


AW: Assertion in merge.c failed while merging

Posted by Markus Schaber <m....@3s-software.com>.
Hello, Ruben,

Could you retry the just published 1.7.5 which contains lots of fixes, and is based on the SVN library 1.7.3 which also contains lots of fixes?

Thanks,

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 


-----Ursprüngliche Nachricht-----
Von: Stein, Ruben [mailto:ruben.stein@mevis.fraunhofer.de] 
Gesendet: Dienstag, 14. Februar 2012 13:23
An: users@subversion.apache.org
Betreff: Assertion in merge.c failed while merging

Hello,

I just got the following message from Tortoise-SVN 1.7.4:

[Š]TortoiseSVN-1.7.4\ext\subversion\subversion\libsvn_client\merge.c'
line 2935: assertion failed (SVN_IS_VALID_REVNUM(rev_primary_url_deleted))

I was trying to continue with a merge operation. I am merging a range of revisions from one branch's subtree to another one's corresponding subtree. After merging the first revision-range, Tortoise requested me to resolve any conflicts encountered so far. I did so and re-ran the merge operation. It started downloading about 100MB (may be sensible respecting the amount of revisions to be merged) without showing any changes and then suddenly showed the above described error.

After this, I did a clear on the entire subtree I wanted to merge and retried the merge operation. The problem is reproducible and occurs again after the same amount of downloaded data.

I will try to do the merge in smaller intervals to test if I can localize the problem in a specific version.

Regards, Ruben