Re: [wdiff-bugs] wdiff.texinfo front matter

[Denver Gingerich]

Thanks for the patch.  Unfortunately, it's not quite applying properly
for me.  I get the following:

$ patch -p6 < ../texinfo.patch
patching file doc/wdiff.texi
Hunk #1 FAILED at 8.
Hunk #2 succeeded at 47 with fuzz 2.
Hunk #3 succeeded at 57 with fuzz 2.
Hunk #4 succeeded at 103 with fuzz 2.
Hunk #5 succeeded at 1154 with fuzz 2.
1 out of 5 hunks FAILED -- saving rejects to file doc/wdiff.texi.rej

The rejects file is attached.  I verified this issue with the latest
pre-test code (wdiff-0.5.91.tar.gz).  Am I doing something wrong?

Denver


On 8/10/07, Karl Berry <address@hidden> wrote:
> Some simple diffs for the wdiff manual.
>
> 1) use the standard @dircategory/@direntry cmds instead of the old (very
> old) INFO-DIR-ENTRY stuff.  (With the category names and alignments set
> to match other packages.)
>
> 2) use @copying instead of @ifinfo.
>
> 3) move @contents to after the title page where it belongs.
>
> Thanks,
> karl
>
> *** /usr/local/gnu/src/wdiff-0.5.91/doc/ORIG/wdiff.texi Thu Jun 21 20:58:08 
> 2007
> --- /usr/local/gnu/src/wdiff-0.5.91/doc/wdiff.texi      Thu Aug  9 17:08:22 
> 2007
> ***************
> *** 8,23 ****
>   @include version.texi
>
> ! @ifinfo
> ! @format
> ! START-INFO-DIR-ENTRY
> ! * wdiff and diff tools: (wdiff).        GNU wdiff and diff related tools.
>   * mdiff: (wdiff)mdiff invocation.               Line cluster finder.
>   * unify: (wdiff)unify invocation.               Diff format converter.
>   * wdiff: (wdiff)wdiff invocation.               Word difference finder.
> ! END-INFO-DIR-ENTRY
> ! @end format
> ! @end ifinfo
>
> ! @ifinfo
>   This file documents the @code{wdiff} command, which compares two files,
>   finding which words have been deleted or added to the first for getting
> --- 8,24 ----
>   @include version.texi
>
> ! @dircategory Text creation and manipulation
> ! @direntry
> ! * Word differences: (wdiff).    GNU wdiff and diff related tools.
> ! @end direntry
> !
> ! @dircategory Individual utilities
> ! @direntry
>   * mdiff: (wdiff)mdiff invocation.               Line cluster finder.
>   * unify: (wdiff)unify invocation.               Diff format converter.
>   * wdiff: (wdiff)wdiff invocation.               Word difference finder.
> ! @end direntry
>
> ! @copying
>   This file documents the @code{wdiff} command, which compares two files,
>   finding which words have been deleted or added to the first for getting
> ***************
> *** 46,50 ****
>   except that this permission notice may be stated in a translation approved
>   by the Foundation.
> ! @end ifinfo
>
>   @titlepage
> --- 47,51 ----
>   except that this permission notice may be stated in a translation approved
>   by the Foundation.
> ! @end copying
>
>   @titlepage
> ***************
> *** 56,74 ****
>   @page
>   @vskip 0pt plus 1filll
> ! Copyright @copyright{} 1992, 1994, 1997, 1998 Free Software Foundation, Inc.
> !
> ! Permission is granted to make and distribute verbatim copies of
> ! this manual provided the copyright notice and this permission notice
> ! are preserved on all copies.
> !
> ! Permission is granted to copy and distribute modified versions of this
> ! manual under the conditions for verbatim copying, provided that the entire
> ! resulting derived work is distributed under the terms of a permission
> ! notice identical to this one.
> !
> ! Permission is granted to copy and distribute translations of this manual
> ! into another language, under the above conditions for modified versions,
> ! except that this permission notice may be stated in a translation approved
> ! by the Foundation.
>   @end titlepage
>
> --- 57,61 ----
>   @page
>   @vskip 0pt plus 1filll
> ! @insertcopying
>   @end titlepage
>
> ***************
> *** 116,119 ****
> --- 103,108 ----
>   @end ifnottex
>
> + @contents
> +
>   @node Overview, mdiff, Top, Top
>   @chapter Overview
> ***************
> *** 1165,1168 ****
>   @end itemize
>
> - @contents
>   @bye
> --- 1154,1156 ----
>
>
>
>

wdiff.texi.rej
Description: application/reject