[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Assertion when merging a revision range

From: Ted Francis <tedfrancis2000-code_at_yahoo.co.uk>
Date: Fri, 3 Apr 2009 01:46:25 -0700 (PDT)

I encountered an SVN assertion when merging a range of revisions.
I posted this first on the TortoiseSVN forum and was asked to post it here.

Using TortoiseSVN version:
TortoiseSVN 1.6.0, Build 15855 - 32 Bit , 2009/03/21 12:36:36

Steps:
Merge a revision range from a branch to trunk
Merge encountered a conflict in Manifest.xml file (which has svn:mimetype=applica​tion/octet-stream)
Edit conflicts button is grayed out (I assumed because of mimetype)
Clicked "Resolve later" to continue merging
the rest of the revision range
Assertion message displayed a few moments later (I couldn't work out from the message which specific revision caused the assertion)

Merging revisions 13170-13232 of svn://svn_server/MyR​epos/Branches/3.1.0.​0 into C:\dev\whole\WholeTrunk, respecting ancestry
C:\dev\whole\WholeTrunk
C:\dev\whole\Whol​eTrunk\NightlyBuild​\Installers\Full Installation\MyInstaller\Script Files\FeatureEvents.rul
C:\dev\whole\WholeTrunk
C:\dev\whole\Whol​eTrunk\Communicatio​ns Server\Reconfigure
C:\dev\whole\Whol​eTrunk\NightlyBuild​\scripts\branch\M​anifest.xml
In file
'D:\Development\SV​N\Releases\Tortois​eSVN-1.6.0\ext\sub​version\subversion​libsvn_client\merg​e.c'
line 2525: assertion failed (SVN_IS_VALID_REVNUM( revision_primary_url_deleted))

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1530318

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-03 13:44:00 CEST

This is an archived mail posted to the Subversion Users mailing list.