On Tue, Dec 20, 2016 at 08:48:27PM +0200, John Found wrote: > What makes the binary files different from the text files? The presence or > absence of > 0 bytes does not seems to make serious difference for processing by the same > algorithms.
Many text formats allow merging changes from one version to another with minimal context. E.g. let's say you start from a C file and modify a line in the middle in your checkout and then update your tree. Someone else added a new function at the beginning of the file. This creates a conflict and Fossil will try to resolve it by finding the context of the line you modified in a similiar place and then readd that change. While this doesn't work all the time for text files, it has a high chance of working. Even if it doesn't work i.e. because the changes overlap, it provides enough information that a user can typically do the same. The same kind of tooling could be provided for binary formats, but it is rarely exist directly. Joerg _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
