Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

FW: patch-2.5.3 - possible bug (patch cannot be applied)



Somebody mangled the patch on the way ... I should note that :-( But both
are looking absolutely identically ...

-----Original Message-----
From: Ken Pizzini [mailto:ken@xxxxxxxxxxx]
Sent: Tuesday, March 30, 1999 9:51 PM
To: borsenkow.msk@xxxxxx
Subject: Re: patch-2.5.3 - possible bug (patch cannot be applied)


In gnu.utils.bug,
message <002101be7aa9$e3375ab0$21c9ca95@xxxxxxxxxxxxxxx>, you wrote:
>bor@itsrm2:/tools/src/zsh-3.1.5-pws-14/Doc%> patch -p1 --dry-run <
>~/tmp/zsh.yo.
>patch
>patching file zsh.yo
>Hunk #1 FAILED at 66.
>Hunk #2 succeeded at 79 with fuzz 1.
>1 out of 2 hunks FAILED -- saving rejects to file zsh.yo.rej
...
>@@ -66,6 +66,7 @@=0A=
> ifnzman(includefile(Zsh/compctl.yo))^A=0A=
> ifnzman(includefile(Zsh/compwid.yo))^A=0A=
> ifnzman(includefile(Zsh/modules.yo))^A=0A=
>+ifnzman(includefile(Zsh/compsys.yo))^A=0A=
> ifzshall(\=0A=
> def(source)(1)(NOTRANS(.so )man1/ARG1NOTRANS(.)1)\=0A=
> CMT()=0A=
...
>ifnzman(includefile(Zsh/compctl.yo))=01=0A=
>ifnzman(includefile(Zsh/compwid.yo))=01=0A=
>ifnzman(includefile(Zsh/modules.yo))=01=0A=
>ifzshall(\=0A=
>def(source)(1)(NOTRANS(.so )man1/ARG1NOTRANS(.)1)\=0A=
>CMT()=0A=

Note that the patch is looking for lines ending with the
two characters ^ A, but the file itself ends with the
single character Ctrl-A.  (This happens to be much
more visible in the quoted-printable that you happend
to mail than it would be in an editor which represents
Ctrl-A as a ^A pair.)

		--Ken Pizzini




Messages sorted by: Reverse Date, Date, Thread, Author