TortoiseSVN 1.6.0: Assert during merge of application/octetstream mimetype.

[Sorry for the double-post: I already posted this message once without logging in first]

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=application/octet-stream)
Edit conflicts button is grayed out (I assumed because of mimetype)
Clicked "Resolve later" to continue merging
Assertion message displayed a few moments later:

Merging revisions 13170-13232 of svn://svn_server/MyRepos/Branches/3.1.0.0 into C:\dev\whole\WholeTrunk, respecting ancestry
C:\dev\whole\WholeTrunk
C:\dev\whole\WholeTrunk\NightlyBuild\Installers\Full Installation\MyInstaller\Script Files\FeatureEvents.rul
C:\dev\whole\WholeTrunk
C:\dev\whole\WholeTrunk\Communications Server\Reconfigure
C:\dev\whole\WholeTrunk\NightlyBuild\scripts\branch\Manifest.xml
In file
'D:\Development\SVN\Releases\TortoiseSVN-1.6.0\ext\subversion\subversion\libsvn_client\merge.c'
line 2525: assertion failed (SVN_IS_VALID_REVNUM( revision_primary_url_deleted))

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1518372

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-02 14:57:49 CEST