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: (pBlob)->xRealloc==blobReallocMalloc || >> (pBlob)->xRealloc==blobReallocStatic, file blob_.c, line 170 > > > Bummer. What does "fossil status" tell you? If you don't have any > changes that you need to check-in, you can probably work around this > problem by running "fossil checkout" instead of "fossil update". But > I'd still like to get to the bottom of the problem. Do you have a C- > compiler and a debugger? Can you run fossil in the debugger and give > me additional information about where it is failing, so that I can > find and fix the problem? > > D. Richard Hipp > d...@hwaci.com >
I think that this problem is easy to reproduce. First check in a png image. Open second workspace and replace local copy of this image in this second workspace. In first workspace check in another png file as a new version. And in the second workspace update will trigger the assertion - as there is no way to merge binary files. For such a situation with failing update there is described workarounds. But when you acreate a fork with binary files I think it may be impossible to merge this fork. If my description is not precise enough I will create testcase script within a few days to show exactly my problem. Of cource if you don't put binary files in your repo probably you are not affected (thanks for advise on Visual Studio projects). But maybe I am missing something and if this is obvious for you please advice me how to proceed with merging forks with binary files. Tomasz Kosiak _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
