Re: experimental conffile merge for dpkg

2003-04-28 Thread Paul Hampson
On Mon, Apr 28, 2003 at 09:59:20AM +1000, Brian May wrote: > On Sun, Apr 27, 2003 at 03:52:13PM +0300, Jarno Elonen wrote: > > > There might be things to think about though: some packages have lots > > > of conffiles, and that could mean some extra disk space, which not > > > everyone will want t

Re: experimental conffile merge for dpkg

2003-04-27 Thread Brian May
On Sun, Apr 27, 2003 at 03:52:13PM +0300, Jarno Elonen wrote: > > There might be things to think about though: some packages have lots > > of conffiles, and that could mean some extra disk space, which not > > everyone will want to spend. Maybe make it optional. > > Bzipping could help, and may

Re: experimental conffile merge for dpkg

2003-04-27 Thread Jarno Elonen
> There might be things to think about though: some packages have lots > of conffiles, and that could mean some extra disk space, which not > everyone will want to spend. Maybe make it optional. Bzipping could help, and maybe even tarring them all to one file. As a quick test, I bzip-tarred my

Re: experimental conffile merge for dpkg

2003-04-27 Thread Roland Mas
Jarno Elonen (2003-04-27 14:16:02 +0300) : > If we can agree wether or not, how and where the original conffiles > should be saved, I'll be happy to implement 3-way merging to dpkg > and write imediff3 as a user friendly UI for it. Opinions? Unrelated to this diff thing, it's going to be a big he

Re: experimental conffile merge for dpkg

2003-04-27 Thread Jarno Elonen
> Why two-way merge instead of three-way? Because of... > Unfortunately neither is currently possible at the moment, simply > because dpkg doesn't save a copy of the last installed config file > anywhere. ...this. I thought it would make big difference to have even 2-way merging now instead of

Re: experimental conffile merge for dpkg

2003-04-27 Thread Brian May
On Sun, Apr 27, 2003 at 03:40:33AM +0300, Jarno Elonen wrote: > http://elonen.iki.fi/code/dpkg-merge/ contains the patched dpkg > and a new interactive python & curses based two-way merge tool > called imediff2 (+ 3 screenshots for the impatient). Why two-way merge instead of three-way? The probl

experimental conffile merge for dpkg

2003-04-26 Thread Jarno Elonen
Hi, I've written an experimental conffile merge support for dpkg. http://elonen.iki.fi/code/dpkg-merge/ contains the patched dpkg and a new interactive python & curses based two-way merge tool called imediff2 (+ 3 screenshots for the impatient). For those who would like try it: + install 'dpk