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

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

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 02 Apr 2009 17:49:57 +0200

Ted Francis wrote:
> [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))

Please report this on the subversion mailing list (users at subversion
tigris org): the assertion is inside the svn library and they have to
find out why the assertion triggers.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1520561
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-04-02 17:50:17 CEST

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