summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/patch
diff options
context:
space:
mode:
authorMark Murray <markm@FreeBSD.org>1996-04-12 11:37:32 +0000
committerMark Murray <markm@FreeBSD.org>1996-04-12 11:37:32 +0000
commit01aa0a09a4db373f8d10b7bb21cd1045a20c9883 (patch)
treee333683674b6cebfee9273a7907361a14041b017 /gnu/usr.bin/patch
parentbcb1a9de5560087dc98afbd60ceb86bddb879aed (diff)
Notes
Diffstat (limited to 'gnu/usr.bin/patch')
-rw-r--r--gnu/usr.bin/patch/pch.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/gnu/usr.bin/patch/pch.c b/gnu/usr.bin/patch/pch.c
index 159852295320..eb0c54a49097 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