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 into fossil repo Visual Studio & NetBeans project files that are essentially binary files. Due to some 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. Is there a way I can handle this merge (my problem is not in constructing proper binary project files that would be commited in merged check-in).
I give this description to show that it may be quite common problem in using fossil with "popular" IDEs. If you work with a GNU toolchain you probably would never hit such a problem as all your Makefiles are plain text. But think also about keeping in Fossil SCM images updated by a few designers - also common scenario. I know that fossil aborts also on update to binary files when it cannot merge it. And there is already a ticket http://www.fossil-scm.org/fossil/tktview?name=3f2cb270b2 I would appreciate any suggestions or discussion how to handle such scenario. In fact I have recommended fossil for a few of my students and they have get stuck with it. So maybe there is an area that should be address .. or documented. Regards, Tomasz Kosiak D:\__work3e\wrk\sg_sdk\src>fossil version This is fossil version [d5695157d0] 2009-11-11 16:21:19 UTC D:\__work3e\wrk\sg_sdk\src>fossil leaves === 2009-12-12 === 20:48:52 [5309f4995b] *CURRENT* renamed (user: tkosiak tags: trunk) 20:03:12 [0bfcca33db] merge attempt (user: tkosiak tags: trunk) D:\__work3e\wrk\sg_sdk\src>fossil merge 0bfc [...] ADDED exp/java-final2/rdt-javagui/src/rdtapi/rdtapisampleapp/RDTAPISampleView.java ADDED exp/java-final2/rdt-javagui/src/rdtapi/rdtapisampleapp/resources/RDTAPI Sample App.ico ADDED exp/java-final2/rdt-javagui/src/rdtapi/rdtapisampleapp/resources/RDTAPISampleApp.properties ADDED exp/java-final2/rdt-javagui/src/rdtapi/rdtapisampleapp/resources/RDTAPISampleView.properties MERGE exp/java-final/rdt-cpp/rdt.suo ***** 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. Please contact the application's support team for more information. D:\__work3e\wrk\sg_sdk\src> _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
