Bug#473996: promptconfaction should offer vimdiff too

2019-01-20 Thread Paul "LeoNerd" Evans
On Fri, 11 Jan 2019 12:21:27 + "Paul \"LeoNerd\" Evans" wrote: > Really this is just about saving myself some keystrokes. I'd rather > hit > > e > > than > > z vimdiff /etc/sshd/ssh_config{,.dpkg_new} > ... > fg > > every time. There's no complicated questions about 3way diff in

Bug#473996: promptconfaction should offer vimdiff too

2019-01-11 Thread Paul "LeoNerd" Evans
On Sun, 2 Dec 2018 15:06:37 +0100 Guillem Jover wrote: > - There is a desire to get 3-way merge support. This is currently >just unreliable, as we do not keep all the information required. >I'd rather not spend time on this until the conffiledb work is >merged, which I just need to

Bug#473996: promptconfaction should offer vimdiff too

2019-01-11 Thread Chris Lamb
Chris Lamb wrote: > > - There is a desire to get 3-way merge support. This is currently > >just unreliable, as we do not keep all the information required. > >I'd rather not spend time on this until the conffiledb work is > >merged, which I just need to sit down and do. :) > > Is

Bug#473996: promptconfaction should offer vimdiff too

2018-12-21 Thread Chris Lamb
Hi Guillem, > - There is a desire to get 3-way merge support. This is currently >just unreliable, as we do not keep all the information required. >I'd rather not spend time on this until the conffiledb work is >merged, which I just need to sit down and do. :) Is there an ETA on

Bug#473996: promptconfaction should offer vimdiff too

2018-12-02 Thread Guillem Jover
Hi! On Fri, 2018-11-23 at 13:09:13 -0500, Chris Lamb wrote: > [Adding guil...@debian.org to CC] > [Adding 473...@bugs.debian.org to CC] > > In order for this bug not to sit idle for yet another five years, > > attached is my attempt at a patch. > > Alas, I don't think that this will merged

Bug#473996: promptconfaction should offer vimdiff too

2018-11-25 Thread Paul "LeoNerd" Evans
On Fri, 23 Nov 2018 13:09:13 -0500 "Chris Lamb " wrote: > [Adding guil...@debian.org to CC] > [Adding 473...@bugs.debian.org to CC] > > Hi Paul, > > > In order for this bug not to sit idle for yet another five years, > > attached is my attempt at a patch. > > Alas, I don't think that

Bug#473996: promptconfaction should offer vimdiff too

2018-11-23 Thread Chris Lamb
[Adding guil...@debian.org to CC] [Adding 473...@bugs.debian.org to CC] Hi Paul, > In order for this bug not to sit idle for yet another five years, > attached is my attempt at a patch. Alas, I don't think that this will merged simply because it hard- codes vimdiff. I tried applying one of the

Bug#473996: promptconfaction should offer vimdiff too

2018-04-11 Thread Paul "LeoNerd" Evans
On Wed, 31 Aug 2011 14:08:34 +0100 Paul LeoNerd Evans wrote: > Any particular reason the above patch, or functionallity like it, > hasn't been added into dpkg yet? I find that the vast majority of > cases when dpkg finds a difference in a file, I hit Z to get a shell, >

Bug#473996: promptconfaction should offer vimdiff too

2011-08-31 Thread Paul LeoNerd Evans
Package: dpkg Version: 1.16.0.3 Followup-For: Bug #473996 Any particular reason the above patch, or functionallity like it, hasn't been added into dpkg yet? I find that the vast majority of cases when dpkg finds a difference in a file, I hit Z to get a shell, then vimdiff