From ripley@stats.ox.ac.uk  Mon Sep  3 11:22:17 2001
From: ripley@stats.ox.ac.uk (Prof Brian Ripley)
Date: Mon, 3 Sep 2001 11:22:17 +0100 (BST)
Subject: [Rd] R-1.3.0-1.3.1.diff does not patch correctly
In-Reply-To: <x2ae0cziod.fsf@blueberry.kubism.ku.dk>
Message-ID: <Pine.LNX.4.31.0109031120520.7956-100000@gannet.stats.ox.ac.uk>

On 3 Sep 2001, Peter Dalgaard BSA wrote:

> Peter Dalgaard BSA <p.dalgaard@biostat.ku.dk> writes:
>
> > wb@vestein.arb-phys.uni-dortmund.de (Wilhelm B. Kloke) writes:
> >
> > > Subj. says it. The patch contains several lines complaining about "No newline".
> > > After removing these the patch was applicable.
> >
> > Odd. This worked cleanly when I tried it on RedHat 7.1. What version
> > of patch is this?
> >
> > The offending lines are flagged with a \ in col.1, which is
> > undocumented in the info file for diff, but obviously discernible from
> > ordinary unidiff lines (which have either space, + , or - ). So I
> > suspect that a recent "patch" just treats that as a comment.
> >
> > Looks like the problem could be difficult to avoid (except by ensuring
> > that we don't have any files without terminal newlines) since I see no
> > diff option controlling the behaviour.
>
> BTW: The offending files are these:
>
> +++ R-1.3.1/src/library/base/man/Rhome.Rd       Sun Aug  5 02:00:39 2001
> +++ R-1.3.1/src/library/base/man/kronecker.Rd   Sun Aug  5 02:00:39 2001
> +++ R-1.3.1/src/library/base/man/manova.Rd      Sun Aug  5 02:00:39 2001
> +++ R-1.3.1/src/library/mva/man/Harman74.cor.Rd Wed Aug  8 06:32:40 2001
> +++ R-1.3.1/src/macintosh/FF_CREATE     Sun Aug 19 08:55:53 2001
> +++ R-1.3.1/src/macintosh/GETVERSION    Sun Aug 19 08:56:27 2001
> +++ R-1.3.1/src/macintosh/ReadMe.MPW    Sun Aug 19 08:04:58 2001
>
> The ones in the .Rd files should be avoidable. I'm less sure about the
> Mac files.

They already are avoided in the R-devel tree.

-- 
Brian D. Ripley,                  ripley@stats.ox.ac.uk
Professor of Applied Statistics,  http://www.stats.ox.ac.uk/~ripley/
University of Oxford,             Tel:  +44 1865 272861 (self)
1 South Parks Road,                     +44 1865 272860 (secr)
Oxford OX1 3TG, UK                Fax:  +44 1865 272595

-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
r-devel mailing list -- Read http://www.ci.tuwien.ac.at/~hornik/R/R-FAQ.html
Send "info", "help", or "[un]subscribe"
(in the "body", not the subject !)  To: r-devel-request@stat.math.ethz.ch
_._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._._


[Rd] R-1.3.0-1.3.1.diff does not patch correctly
Prof Brian Ripley