Christoph Biedl wrote...
> The conffile conflict handling ("conffile-prompt") done by dpkg (and
> ucf as well) was always quite painful. This is not dpkg's fault, it's
> just bringer of the bad news that is: Two sides fiddled with the same
> file, it's not possible to resolve that in a robust way. So bug the
> user about it.
To update from a discussion in IRC:
> * Environment variables
>
> When using the "z" (shell) option in the conffile conflict dialog,
> load the names of the two files into environment variables so an
> external program can just pick the names from there.
They exist as DPKG_CONFFILE_OLD and DPKG_CONFFILE_NEW, man dpkg(1)
Sorry for the noise, I must have overseen them every time I checked.
> * Launch configurable helper from dialog
>
> Create a configuration option to define a "conffile conflict helper
> program", that will show up in the dialog as well, perhaps as
> "(X) Run configured helper program $helper on these files"
Guillem plans to work on the conffiledb so the original file was
available as well, this would allow a three-way merge then. It's
certainly worth waiting for this.
> * Full integration
>
> If there's a program that seems suitable for universal use, embed this
> into dpkg. This has already been suggested in #601063
Given the many tools to handle merge conflicts out there this is rather
not going to happen.
Christoph
signature.asc
Description: Digital signature
