Re: bug in cvs using diff -p

[YONETANI Tomokazu <qhwt+dfly@xxxxxxxxxx>]

On Tue, Sep 04, 2007 at 08:13:08AM +0000, Vincent Stemen wrote:
> When using the -p option to diff when running under cvs, it outputs
> a broken patch file.  The problem is that it outputs the previous line
> at the end of the '@@' line rather than the function name.
> 
> # cvs diff -u -p md.c
> Index: md.c
> ===================================================================
> RCS file: /home/dcvs/src/sys/dev/disk/md/md.c,v
> retrieving revision 1.16.2.1
> diff -u -p -r1.16.2.1 md.c
> --- md.c        31 Jul 2007 22:40:49 -0000      1.16.2.1
> +++ md.c        4 Sep 2007 06:36:37 -0000
> @@ -373,6 +373,8 @@             DEVSTAT_TYPE_DIRECT | DEVSTAT_TYPE_IF_
>                 DEVSTAT_PRIORITY_OTHER);
>         sc->dev = disk_create(sc->unit, &sc->disk, &md_ops);
>         sc->dev->si_drv1 = sc;
> +       sc->dev->si_iosize_max = DFLTPHYS;
> +
>         return (sc);
>  }
> 
> 

JFYI, this works properly on DragonFly 1.8-RELEASE, or with cvs-1.12.13
installed from source on CentOS-4.5.  So it must be more recent changes
that's causing it.

Cheers.