retitle 413436 [CONFFILE] Cleverer conffile merge
merge 32877 413436
thanks

Hi,

On Mon, 2007-03-05 at 00:45:10 +0100, Nico Golde wrote:
> Package: dpkg
> Version: 1.13.25
> Severity: wishlist
> Tags: patch

> it would be cool if dpkg could use an external program to 
> merge a new and an old configuration file on package update.
> The current situation is a bit suboptimal since you loose 
> your old changes when installing the new version of a 
> configuration file (ok there is a backup) and if you keep 
> your old installation you can miss new configuration 
> parameters and stuff.

> I created a patch to introduce a variable for dpkg 
> (merge-tools e.g. merge-tools /usr/bin/vimdiff) to enable 
> this feature.
> You can find the patch on: http://nion.modprobe.de/dpkg_allowmerge.patch

Please in the future attach patches in your bug reports. Also by
skimming over the patch I see this is wrong:

@@ -62,6 +62,7 @@ enum conffopt {
   cfof_prompt        =     001,
   cfof_keep          =     002,
   cfof_install       =     004,
+  cfof_merge         =     006,
   cfof_backup        =   00100,
   cfof_newconff      =   00200,
   cfof_isnew         =   00400,

this should be a uniq octal value to be ORed, and this one is a
combination of 002 and 004.

> This would also close 120152 and 32877 since you can just
> specify these programs.

Why did you open a new bug report, knowing that there's already 8
other merged ones, with patches.

regards,
guillem


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to