[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Why isn't the merge patch being merged?

On Wed, 24 Oct 2007, Johan Walles wrote:
> > We have many patches lying in the BTS but many of them are old and
> > probably don't apply anymore and need to be refreshed and discussed.
> This one seems actively maintained; for a couple of years now the
> author has been packaging his own patched dpkg (currently at 1.14.5):
> http://elonen.iki.fi/code/unofficial-debs/dpkg-merge/

I saw this somewhat later on, after I finished my reply. Except for a file
rename (man/C/dpkg.1 -> man/dpkg.1), the patch applied fine to the current

On the other hand, it might be that a 2-way merge is not what we're
looking for. It's certainly better than nothing but OTOH it would be 2
times better if we could have 3-way merge so that we can even add a new
option --force-confmerge that tries automatically a 3-way merge and that
falls back to the usual behaviour --force-conf{new,old,def} if the merge
process failed.

But it requires more extensive changes as we need to keep a copy of the
conffiles as shippped by the previous version of the package.

Jarno, would you be interested to work on that?

Raphaël Hertzog

Premier livre français sur Debian GNU/Linux :

Reply to: