Fossil SCM

I pulled changes from a remote repository and then wanted to update my local files. Apparently one of the binary files had changed locally and fossil couldn't merge it. That's expected, but fossil stopped with an assertion afterwards. Here's the console log (remote ip removed):

C:\Users\MrPokeylope\fossilrepo\local>fossil update
Autosync:  http://XX.XXX.XX.XXX:XXXXX
                Bytes      Cards  Artifacts     Deltas
Send:             130          1          0          0
Received:        1242         27          0          0
Total network traffic: 323 bytes sent, 858 bytes received
UPDATE code/SyntaxDiagramm/Debugging/Debugging.suo
UPDATE code/SyntaxDiagramm/Debugging/Sample.syndiag
UPDATE code/SyntaxDiagramm/Debugging/Sample.syndiag.diagram
UPDATE code/SyntaxDiagramm/Dsl/CustomCode/FixUpDiagram.cs
UPDATE code/SyntaxDiagramm/Dsl/DslDefinition.dsl
UPDATE code/SyntaxDiagramm/Dsl/DslDefinition.dsl.diagram
UPDATE code/SyntaxDiagramm/Dsl/GeneratedCode/ConnectionBuilders.cs
UPDATE code/SyntaxDiagramm/Dsl/GeneratedCode/Diagram.cs
UPDATE code/SyntaxDiagramm/Dsl/GeneratedCode/DomainClasses.cs
UPDATE code/SyntaxDiagramm/Dsl/GeneratedCode/DomainModel.cs
UPDATE code/SyntaxDiagramm/Dsl/GeneratedCode/DomainModelResx.resx
UPDATE code/SyntaxDiagramm/Dsl/GeneratedCode/DomainRelationships.cs
UPDATE code/SyntaxDiagramm/Dsl/GeneratedCode/Serializer.cs
UPDATE code/SyntaxDiagramm/Dsl/GeneratedCode/Shapes.cs
UPDATE code/SyntaxDiagramm/Dsl/GeneratedCode/SyntaxDiagrammSchema.xsd
UPDATE code/SyntaxDiagramm/Dsl/obj/Debug/TempPE/GeneratedCode.HelpKeywordHelper.cs.dll
UPDATE code/SyntaxDiagramm/Dsl/obj/Debug/TempPE/GeneratedCode.PropertiesGrid.cs.dll
UPDATE code/SyntaxDiagramm/DslPackage/obj/Debug/TempPE/GeneratedCode.Constants.cs.dll
UPDATE code/SyntaxDiagramm/DslPackage/obj/Debug/VSCT.read.1.tlog
UPDATE code/SyntaxDiagramm/DslPackage/obj/Debug/VSCT.write.1.tlog
MERGE code/SyntaxDiagramm/SyntaxDiagramm.suo
***** Cannot merge binary file code/SyntaxDiagramm/SyntaxDiagramm.suo
Assertion failed: (pBlob)->xRealloc==blobReallocMalloc || (pBlob)->xRealloc==blobReallocStatic, file blob_.c, line 170

This application has requested the Runtime to terminate it in an unusual way.
Please contact the application's support team for more information.

C:\Users\MrPokeylope\fossilrepo\local>fossil version
This is fossil version [d5695157d0] 2009-11-11 16:21:19 UTC

anonymous added on 2009-11-16 20:46:27:
Here's some additional info: the file SyntaxDiagramm.suo had the "hidden" attribute.

drh added on 2009-12-19 03:17:46:
See check-in [8e147fdbac452ff3d92faa44bd26f678e3c00efb].