diff options
| author | markm <markm@FreeBSD.org> | 1996-04-12 11:37:32 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 1996-04-12 11:37:32 +0000 |
| commit | c6ad12c81beb745976817a3dbf0468833c81f470 (patch) | |
| tree | e333683674b6cebfee9273a7907361a14041b017 /gnu/usr.bin | |
| parent | 0bf2c140a98509ddcfc6370f19f3a38b8d55abef (diff) | |
| download | FreeBSD-src-c6ad12c81beb745976817a3dbf0468833c81f470.zip FreeBSD-src-c6ad12c81beb745976817a3dbf0468833c81f470.tar.gz | |
Attempt to break a $Log$ snafu where a *** /--- (minus space)
was fouling up a comment in the checked-out code.
Diffstat (limited to 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/patch/pch.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/gnu/usr.bin/patch/pch.c b/gnu/usr.bin/patch/pch.c index 1598522..eb0c54a 100644 --- a/gnu/usr.bin/patch/pch.c +++ b/gnu/usr.bin/patch/pch.c @@ -1,6 +1,21 @@ -/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.c,v 1.6 1995/09/14 04:33:35 gibbs Exp $ +/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.c,v 1.7 1996/04/11 10:13:40 markm Exp $ * * $Log: pch.c,v $ + * Revision 1.7 1996/04/11 10:13:40 markm + * Priorities were broken. If there was an Index: line and *** /--- lines + * with valid names, the *** /---names were taken first. + * this broke eg: + * Index: foo/Makefile + * ========== + * RCS <blah> + * Retrieving <blah> + * diff <blah> + * *** Makefile <blah> + * --- Makefile <blah> + * + * By trying to patch the Makefile in the _curent_ directory, rather than + * the one in the foo/ directory. + * * Revision 1.6 1995/09/14 04:33:35 gibbs * Give "Index" specified filenames preference over other filenames specified * in the diff. This makes it so that diffs containing files in different |
