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

On Tue, Dec 15, 2009 at 9:37 PM, D. Richard Hipp 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: (pBlob)->xRea

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

That's what I have done right now. And it worked! :-)) I can go on preparing my delivery. Nevertheless I have saved the failed version, so I can do more investigations tomorrow. Thanks for help. Best Regards Hein Stephan Beal schrieb: > On Tue, Dec 15, 2009 at 9:50 PM, Heinrich Huss >

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

On Dec 15, 2009, at 3:53 PM, Stephan Beal wrote: > On Tue, Dec 15, 2009 at 9:50 PM, Heinrich Huss > > 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 checkout to a different di

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

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 checkout to a different directory? You could then copy

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

Hi, this is the output from 'fossil status' $ fossil status repository: d:/Projects/ftest/ftest.fossil local-root: d:/Projects/ftest/old/ server-code: 3c943e7b029e6f1f68b900df8c3db69c1af9b3ea checkout: 37b2a8cd8bd8ce254b92c171276e7707d7d26475 2009-12-15 19:25:14 UTC parent: a5973fb

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

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, f

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

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 Runti

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

> If we consider the nature of binary files for a moment we will see that it > is not possible, in the generic case, to _merge_ binary files. Yes, diffs > can be created and applied, but two versions cannot be merged. Consider > two ZIP files (or .jar files - the same thing). If you merge any given

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

On Sun, Dec 13, 2009 at 1:01 AM, Tomasz Kosiak 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 see that it is

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

> 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 tha

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

Tomasz Kosiak writes: > * Cannot merge binary file exp/java-final/rdt-cpp/rdt.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. >

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

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