Re: [fossil-users] How to merge a fork with binary files?

2009-12-15 Thread Heinrich Huss
Hi, It seems there is something broken in fossil. I'm always getting this error when I try to make a 'fossil update': $ fossil update Assertion failed: (pBlob)-xRealloc==blobReallocMalloc || (pBlob)-xRealloc==blobReallocStatic, file blob_.c, line 170 This application has requested the

Re: [fossil-users] How to merge a fork with binary files?

2009-12-15 Thread D. Richard Hipp
On Dec 15, 2009, at 3:30 PM, Heinrich Huss wrote: Hi, It seems there is something broken in fossil. I'm always getting this error when I try to make a 'fossil update': $ fossil update Assertion failed: (pBlob)-xRealloc==blobReallocMalloc || (pBlob)-xRealloc==blobReallocStatic, file

Re: [fossil-users] How to merge a fork with binary files?

2009-12-15 Thread D. Richard Hipp
On Dec 15, 2009, at 3:53 PM, Stephan Beal wrote: On Tue, Dec 15, 2009 at 9:50 PM, Heinrich Huss heinrich.h...@psh-consulting.de wrote: I will try running this with an debugger later but I have to shift this to tomorrow. I will than give you an update. Have you tried doing a clean

Re: [fossil-users] How to merge a fork with binary files?

2009-12-15 Thread Tomasz Kosiak
On Tue, Dec 15, 2009 at 9:37 PM, D. Richard Hipp d...@hwaci.com wrote: On Dec 15, 2009, at 3:30 PM, Heinrich Huss wrote: Hi, It seems there is something broken in fossil. I'm always getting this error when I try to make a 'fossil update': $ fossil update Assertion failed:

Re: [fossil-users] How to merge a fork with binary files?

2009-12-14 Thread Wilson, Ronald
Sorry if I make a naive remark... but in Visual Studio, afaik, the .suo files are not necessary, only the .sln ones (.dsp ... etc) which are in any case text. You are correct. The .suo files are not necessary and should not be source controlled. However, there are other binary resources that

Re: [fossil-users] How to merge a fork with binary files?

2009-12-14 Thread Stephan Beal
On Sun, Dec 13, 2009 at 1:01 AM, Tomasz Kosiak t...@dacsystem.pl wrote: disconnected operation or problems with merging those binary files I already have two leafs in my repo. When I try to merge them fossil aborts on assertion. If we consider the nature of binary files for a moment we will

[fossil-users] How to merge a fork with binary files?

2009-12-12 Thread Tomasz Kosiak
Hi! I have tried to use fossil for a real life project of creating .NET/Java bindings for a library provided as Windows DLL. This project involves also creating sample apps in MS Visual Studio 2008 and NetBeans showing how to use those bindings. So except regular text source files I have also put