Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook

[rghetta]

On Mon, 2005-05-30 at 23:02 -0500, Glen Ditchfield wrote:
> I definitely would like the add-time hook.  
Consensus seem to be here, yes. I'm working on this.

> File extensions are not unambiguous, even when they are correct.
File extensions aren't generally usable to distinguish a filetype, yes,
but in practice every project uses a limited set of filetypes and
extension conflicts are rare.
Anyway, with the add-time hook you will have access to all file
content :-)

> So I would end up coding three hook functions whose bodies are switch 
> statements, and I'll just have to make sure that I keep the bodies 
> synchronized.  No big problem, I'll just quit making dumb mistakes....  but 
> from a software engineering point of view, wouldn't it be better to have one 
> hook function that looked at the files, and decided to invoke the textual 
> merge, or the XMI merge, or the MS Word merge, or whatever?
Even with the add-time hook you need two functions: one for the add
hook, to mark those files you don't want merged by monotone internal
algorithm, another for choosing wich merge tool to use.
The latter still needs to be invoked at merge time.

Riccardo