On Sun, Dec 13, 2009 at 1:01 AM, Tomasz Kosiak <[email protected]> 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 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/
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
