Hi Volker, * Volker Moell <[EMAIL PROTECTED]> [12/09/01 20:40]: > David T-G wrote: > > > > I see the new PATCHES file and its use in the ChangeLog. Yay :-)
> Apropos the PATCHES file: > I just wanted to apply the patch-1.3.24.vvv.initials patch mentioned a > few postings above (the only other patch I use in addition is > patch-1.3.24.vvv.nntp). In both cases -p1 is the only patch option I > use. For both patch orders (first initials, then nntp or vice versa) I > get the message: > The next patch would create the file PATCHES, > which already exists! Assume -R? [n] > I don't know much about patches, but I think this was not intended. Or > was it my fault in patching wrong? Well, in the patch you have this: diff -udprP mutt-1.3.24.orig/PATCHES mutt-1.3.24/PATCHES --- mutt-1.3.24.orig/PATCHES Mon Nov 26 21:16:52 2001 +++ mutt-1.3.24/PATCHES Mon Dec 3 12:20:45 2001 @@ 0,0 +1 @@ +vvv.nntp But it really should be: diff -udprP mutt-1.3.24.orig/PATCHES mutt-1.3.24/PATCHES --- mutt-1.3.24.orig/PATCHES Mon Nov 26 21:16:52 2001 +++ mutt-1.3.24/PATCHES Mon Dec 3 12:20:45 2001 @@ -1,0 +1 @@ +vvv.nntp for the line to be inserted in PATCHES, and solve this problem when the file already exist. I made the same mistake at first! As well as another one (now fixed): mixing diffs of p0 and p1 form in the same patch. Weirdly enough, this made Thorsten's version of patch (2.5.3) complain, while mine (2.5) was perfectly happy with this. Regards, -- Cedric
