[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: CVS diff generating unuseable patches ?
From: |
Eric Siegerman |
Subject: |
Re: CVS diff generating unuseable patches ? |
Date: |
Mon, 30 Oct 2000 09:56:12 -0500 |
On Wed, Oct 18, 2000 at 05:59:06PM -0700, richard offer wrote:
> I'm trying to generate a large patch that includes new files
> [...]
> But for the new files it starts creating files called /tmp/cvsxxxxx instead of
> the files in the directory ?
>
> ie looking at the diff.
>
>
> Index: drivers/block/audit.c
> ===================================================================
> RCS file: audit.c
> diff -N audit.c
> *** /dev/null Tue Aug 29 14:22:17 2000
> --- /tmp/cvsQt9R2X Wed Oct 18 17:09:29 2000
CVS inserts the "Index:" line specifically so that this will
work. Well, it used to work, until the following change was
made to patch (this is an excerpt of a much longer ChangeLog
entry):
1997-06-12 Paul Eggert <address@hidden>
* pch.c: Ignore Index: line if either old or new line is present, and if
POSIXLY_CORRECT is not set.
So, you can make it work by setting POSIXLY_CORRECT in your
environment when you apply the patch.
Paul, just out of curiosity, can you still recall what this was
about? Given that it breaks "gdiff -N"-generated patches
(whether from CVS or otherwise), it must have been intended to
fix something else. Any idea what?
--
| | /\
|-_|/ > Eric Siegerman, Toronto, Ont. address@hidden
| | /
Nobody ever got fired for buying Microsoft -- but they could get
fired for relying on Microsoft.
- Chris Garrigues