[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 - up
|
From: |
rghetta |
|
Subject: |
Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook - update |
|
Date: |
Tue, 31 May 2005 08:34:17 +0200 |
Attached is a revised patch providing an attribute "manual_merge". If
"true" disables monotone merging algorithm, invoking everytime the
merge2()/merge3() hooks.
The attribute can be automagically set at "add" time, thanks to the
attr_init_functions machinery :)
Current implementation invokes the "binary_file" function of my previous
patch to match filenames, but you can obviously override it to whatever
you want.
Note: the documentation isn't updated.
Riccardo
binfile6.diff
Description: Text Data
Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook, rghetta, 2005/05/29
Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook - update,
rghetta <=