Hello, I think fossil handles bad the conflicts on binary files. Basically, it overwrites the file in case of conflict, expecting the user to do "undo" for planing a later conflict resolution. I think this can end up in lost changes in the working directory too easily.
What about the approach of leaving in the working directory the unmergeable file contents? Wouldn't it be better? Another situation is when 'update' brings in some files that already existed in the working directory (but were unmanaged by fossil). I think fossil simply overwrites them without telling anything. This can also cause an important loss. I'm using fossil released on 2011-01-13 when experiencing this. Regards, Lluís. _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
