On Fri, 13 Oct 2000, John Levon wrote:
> On 13 Oct 2000, Jean-Marc Lasgouttes wrote:
>
> > >>>>> "John" == John Levon <[EMAIL PROTECTED]> writes:
> >
> > John> Also re-gens the
> > John> dialog files so the dialog can't be resized infinitely small ;)
> >
> > Hmm, patch says:
> >
> > fantomas[ssh]: patch -p0 <~/printbrowse.diff
> > patching file ChangeLog
> > patch: **** malformed patch at line 17: diff -u -r1.1 formprintdialog.C
> >
> > JMarc
> >
>
> Hmm, ok my attempt to edit the patch by hand failed. I had a problem in
> that my previous patch was still pending so the diff to ChangeLog was
> wrong (from your point of view). This is why I think diffing ChangeLog is
> silly ;)
Actually all we need is an unbreakable diff of ChangeLog. I first heard
of this tip from the linux-kernel list via the kernel-traffic page. It
goes like this: Remove the context from the end of the ChangeLog diff
so you only have lines starting with a + sign. Then count the number of
lines you are adding (call it XX lines). Change the diff range to be:
@@ -1 +1,XX @@
I'm a bit suspicious of this and think it should more correctly be
@@ -1,0 +1,XX @@
but I haven't tried it.
See: http://kt.linuxcare.com/kernel-traffic/kt20000925_86.epl#11
Maybe I should add an another flag to diff and expand my diff patching
even further to cover this (by checking for a particular filename that
defaults to ChangeLog for example). Then nobody can continue to use it
for building unbreakable patches. ;-)
Allan. (ARRae)
P.S. I did submit my patch to Paul Eggert but I haven't heard from him
yet.
