From c6ad12c81beb745976817a3dbf0468833c81f470 Mon Sep 17 00:00:00 2001
From: markm <markm@FreeBSD.org>
Date: Fri, 12 Apr 1996 11:37:32 +0000
Subject: Attempt to break a $Log$ snafu where a *** /--- (minus space) was
 fouling up a comment in the checked-out code.

---
 gnu/usr.bin/patch/pch.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'gnu/usr.bin')

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
-- 
cgit v1.1