Commit Graph

18 Commits

Author SHA1 Message Date
Kelly Yancey
d2d11ded0f Fix previous commit such that only -S/--skip ignores errors when applying
a patch, returning -f/--force and -t/--batch to their previous semantics.

Pointed out by:	asami
2000-08-02 22:31:34 +00:00
Kelly Yancey
d1b04ce6b7 Fix patch such that skipping files does not count as a failure.
Previously, using -S/--skip, -f/--force, or -t/--batch to skip a patch in
a patchset still registers a failure which causes patch to return a
non-zero exit code. This is particularly undesirable with regards to
ports as there is no way to ignore the non-zero code. (Luckily, we don't
currently have any ports that make use of any of these options.)

The PR (yes, my own) is slightly incorrect: It states that -f does indeed
properly skip patches. It does, but it still sets the failure flag causing
patch to return non-zero.

PR:		19638
Submitted by:	kbyanc@posi.net
2000-08-02 06:54:21 +00:00
Peter Wemm
072ca4aea0 Clean up some $Log$ debris, including some real messes. 1999-09-05 17:31:55 +00:00
Peter Wemm
a1a4f1a0d8 $Header$ -> $FreeBSD$ 1999-08-28 05:11:36 +00:00
Andrey A. Chernov
2aee32e1f8 Add PATCH_INDEX_FIRST environment variable to do the same as -I option 1998-01-22 07:44:04 +00:00
Andrey A. Chernov
0b00e7b2c0 Update usage line with new option 1998-01-21 15:15:39 +00:00
Andrey A. Chernov
8bf2e8c7e2 Add -I or --index-first option to take Index: precedence over context diff,
as it was in hacked FreeBSD version
1998-01-21 15:10:14 +00:00
Andrey A. Chernov
249a716c6c Resurrect patch 2.1 without FreeBSD Index: hack 1998-01-21 14:37:27 +00:00
Andrey A. Chernov
78dd9df206 Upgrade to 2.5 (contrib version) 1998-01-04 21:41:46 +00:00
Andrey A. Chernov
5a90c8dbf2 Add (unsigned char) cast to ctype macros 1997-10-23 02:44:23 +00:00
John-Mark Gurney
5e30934038 fix compilation warnings in patch... (with slight modification)
also remove -Wall that I acidentally committed last time I was here...

Submitted-by: Philippe Charnier

Closes PR#2998
1997-03-17 01:44:43 +00:00
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
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
Paul Richards
36e3306c74 b-maked patch-2.10 1993-06-19 14:21:53 +00:00