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 Runtime to terminate it in an unusual way. Please contact the application's support team for more information $ fossil version This is fossil version [2bb1d6469f] 2009-12-09 14:39:20 UTC I do have binary files (icons, gifs, jpg) in my project. I think some of these binary files were changed by me and somebody else. Now I cannot make an update to get the latest changes from the repository. Any hint's how I can handle this???? Many Thanks Hein Wilson, Ronald schrieb: >> 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 >> bytes, you invalidate some data which a ZIP tool is going to rely on. >> > You > >> will either corrupt a header or the content of a zipped file or >> > something > >> simlar. You have to either take ONE version OR the other, but they >> > cannot, > >> in the generic case, be merged. Features do exists which merge >> > specific > >> types of binary files (e.g. ODF, which are basically XML wrapped in a >> > ZIP > >> file), but no tools exist for generically merging binaries. i would >> > assert > >> that it _cannot_ be done generically because a merge requires some >> information about what is in the binary. >> >> -- >> ----- stephan beal >> http://wanderinghorse.net/home/stephan/ >> > > > True. For example, I use Rational ClearCase at work and it generally > just takes one over the other. Is it reasonable to have fossil do > similar? > > RW > > Ron Wilson, Engineering Project Lead > (o) 434.455.6453, (m) 434.851.1612, www.harris.com > > HARRIS CORPORATION | RF Communications Division > assuredcommunications(tm) > _______________________________________________ > fossil-users mailing list > [email protected] > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > -- Heinrich Huss PSH Consulting GmbH Am Gewerbepark 10 64823 Groß-Umstadt Phone +49 6078 931 6455 Fax +49 6078 96 9536 Mobile +49 171 43 46 773 e-mail [email protected] *** PSH Consulting GmbH Legal Disclaimer *** Diese E-Mail einschließlich ihrer Anhänge ist vertraulich und ist allein für den Gebrauch durch den vorgesehenen Empfänger bestimmt. Dritten ist das Lesen, Verteilen oder Weiterleiten dieser E-Mail untersagt. Wir bitten, eine fehlgeleitete E-Mail unverzüglich vollständig zu löschen und uns eine Nachricht zukommen zu lassen. This email may contain material that is confidential and for the sole use of the intended recipient. Any review, distribution by others or forwarding without express permission is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. Hauptsitz: Magdeburger Strasse 1, D-64720 Michelstadt, USt-IdNr.: DE 21 117 1171 Kommunikation: Telefon +49 6078 931 6455, Telefax +49 6078 96 95 36, www.psh-consulting.de Handelsregister: Amtsgericht Darmstadt, HRB 71404 Geschäftsführer: Heinrich Huss, Thomas Riedl _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
