[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook
From: |
Glen Ditchfield |
Subject: |
Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook |
Date: |
Tue, 31 May 2005 23:52:33 -0500 |
User-agent: |
KMail/1.7.1 |
On Tuesday 31 May 2005 00:27, rghetta wrote:
> 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.
Why can't there be one function that examines the files and decides to run the
internal merge algorithm on some kinds of files, and to exec external tools
on other kinds of files?
I don't know anything about monotone's internal structure, and I don't want to
know, and that's the sort of stuff that changes from release to release
anyway. From out here, the internal merge algorithm looks like just one of
the possible choices of merge tools. I don't see it as being so conceptually
different from other merge tools that it has to be handled by a separate
mechanism out at the user-level hook API.
- Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook,
Glen Ditchfield <=
- Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook, rghetta, 2005/06/01
- Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook, rghetta, 2005/06/01
- Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook, Joel Crisp, 2005/06/01
- Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook, rghetta, 2005/06/01
- Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook, Joel Crisp, 2005/06/01
- Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook, rghetta, 2005/06/10
- Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook, rghetta, 2005/06/10
- Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook, Glen Ditchfield, 2005/06/10