On Thu, Oct 20, 2011 at 3:46 AM, Martin Gagnon <eme...@gmail.com> 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)
>
Others have pointed out that a smart merge tool can deal with multiple
formats. But providing a way to deal with multiple different merge commands
isn't that far beyond the things fossil already does. Consider a setting
"merge-command" whose value is a list like the ignore-glob setting, except
the values are regular-expression=command. Making an empty command mean "use
the internal merge" would allow you to route all merges through it.
<mike
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
