On 10/20/2011 6:46 AM, Martin Gagnon wrote: > On 2011-10-20, at 01:13, Jeff Slutter <j...@slutter.com> wrote: > >> A couple weeks ago I posted about the possibility of a new configuration >> setting called something like "allow-binmerge" (default off). If it is >> enabled, and there is a gmerge-command set, could Fossil call the >> gmerge-command to resolve a binary merge conflict? >> >> I would like to be able to handle merging some [proprietary] binary files >> with my own merge tool, but currently Fossil will refuse to call to >> gmerge-command when a binary file is involved. >> > But for that, you would need a different gmerge-command per file type. (that > have a merge tool)
I have a merge tool I wrote that can make the determination of what to do from the file extension. Either it does the work, spawns [and blocks] another process to do the work, or, in the case of an unmergable, asks the user to choose from either the original or the merged in version. > > I guess the gmerge command might be specified on command line argument and a > new command line argument could be used to force the merge for binary files. > This would be easier to implement than adding configuration entries for that. > I had suggested a gmerge command before, but Richard pointed out that merging of files might happen outside of a [g]merge, such as when doing an update or autosyncing. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
