1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-29 12:03:03 +00:00
Commit Graph

12 Commits

Author SHA1 Message Date
John-Mark Gurney
53e3a4a22c Fix a problem with patch in that is will always default, even when the
controlling terminal is closed.  Now the function ask() will return 1 when th
input is known to come from a file or terminal, or it will return 0 when ther
was a read error.

Modified the question "Skip patch?" so that on an error from ask it will skip
the patch instead of looping.

Closes PR#777

2.2 candidate
1997-02-13 21:10:45 +00:00
Mark Murray
01aa0a09a4 Attempt to break a $Log$ snafu where a *** /--- (minus space)
was fouling up a comment in the checked-out code.
1996-04-12 11:37:32 +00:00
Mark Murray
2bff10e8b9 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.
1996-04-11 10:13:40 +00:00
John Polstra
f8b117f1e4 Update the manual page to reflect the fact that an "Index" line
now takes precedence over a context diff header for determining
the name of the file to patch.
1996-02-07 23:47:55 +00:00
Justin T. Gibbs
312b98f6bb Give "Index" specified filenames preference over other filenames specified
in the diff.  This makes it so that diffs containing files in different
subdirectories that have the same name not patch the same file.  For example
a diff with patches to Makefile, des/Makefile, usr.bin/Makefile would attempt
to patch Makefile three times.
1995-09-14 04:33:35 +00:00
Rodney W. Grimes
4399be3cbd Remove trailing whitespace. 1995-05-30 05:05:38 +00:00
Jeffrey Hsu
add65270a0 Fix bug that created new files even when running in -C check mode.
Reviewed by: phk
1995-01-12 22:09:40 +00:00
Poul-Henning Kamp
e70b6ad7a1 added the -C/-check again. 1994-02-25 21:46:07 +00:00
Jordan K. Hubbard
07d2c9fe20 Put this back - I was somehow under the erroneous impression that patch was in
ports, until I saw the the commit messages, that is! :-)  All changed backed out.
1994-02-17 22:20:36 +00:00
Jordan K. Hubbard
3f125aef7a From Poul-Henning Kamp - Implement a -C option to verify the integrity of
a patch before actually applying it.
1994-02-17 22:16:05 +00:00
Rich Murphey
931407698e Increaed the fixed static buffer sizes and maximum hunk size that
otherwise causes the XFree86 1.3 patch set to fail.
1993-09-22 16:51:03 +00:00
Paul Richards
36e3306c74 b-maked patch-2.10 1993-06-19 14:21:53 +00:00