OpenBSD CVS

CVS log for src/usr.bin/patch/patch.1


[BACK] Up to [local] / src / usr.bin / patch

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.37 / (download) - annotate - [select for diffs], Fri Mar 22 19:22:23 2024 UTC (8 weeks, 1 day ago) by jcs
Branch: MAIN
CVS Tags: HEAD
Changes since 1.36: +7 -5 lines
Diff to previous 1.36 (colored)

add "-V none" to prevent making any backups

from FreeBSD

ok bluhm deraadt

Revision 1.36 / (download) - annotate - [select for diffs], Thu Mar 31 17:27:26 2022 UTC (2 years, 1 month ago) by naddy
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1
Changes since 1.35: +3 -3 lines
Diff to previous 1.35 (colored)

man pages: add missing commas between subordinate and main clauses

jmc@ dislikes a comma before "then" in a conditional, so leave those
untouched.

ok jmc@

Revision 1.35 / (download) - annotate - [select for diffs], Fri Feb 18 23:17:15 2022 UTC (2 years, 2 months ago) by jsg
Branch: MAIN
Changes since 1.34: +3 -3 lines
Diff to previous 1.34 (colored)

Avoid gendered language in man pages when not referring to a specific
person. Rewrite or use singular they.

ok thfr@ sthen@ daniel@ ian@ job@ kmos@ jcs@ ratchov@ phessler@ and
others I'm likely missing on an earlier version.
feedback tj@, feedback and ok jmc@

Revision 1.34 / (download) - annotate - [select for diffs], Tue Dec 21 08:07:20 2021 UTC (2 years, 4 months ago) by schwarze
Branch: MAIN
Changes since 1.33: +6 -4 lines
Diff to previous 1.33 (colored)

state up front that patch(1) operates on text files,
fixing an omission pointed out by chrisz@;
OK jmc@ deraadt@ chrisz@

Revision 1.33 / (download) - annotate - [select for diffs], Tue Nov 9 16:13:40 2021 UTC (2 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.32: +2 -3 lines
Diff to previous 1.32 (colored)

-i may not be specified multiple times; from josh grosse
ok millert

Revision 1.32 / (download) - annotate - [select for diffs], Fri Jun 22 15:37:15 2018 UTC (5 years, 10 months ago) by zhuk
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6, OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.31: +3 -3 lines
Diff to previous 1.31 (colored)

Add --dry-run as synonym to -C/--check.

FreeBSD and NetBSD has this for a while, and GNU patch got it even earlier
than we got -C.

input from sthen@ & jca@; okay sthen@, jca@ and deraadt@.

Revision 1.31 / (download) - annotate - [select for diffs], Wed Apr 11 10:06:50 2018 UTC (6 years, 1 month ago) by zhuk
Branch: MAIN
Changes since 1.30: +2 -8 lines
Diff to previous 1.30 (colored)

Stop telling patch(1) runs ed(1).

okay tb@ and benno@

Revision 1.28.2.1 / (download) - annotate - [select for diffs], Mon Jul 27 16:10:54 2015 UTC (8 years, 9 months ago) by krw
Branch: OPENBSD_5_7
Changes since 1.28: +2 -11 lines
Diff to previous 1.28 (colored) next main 1.29 (colored)

Backport commit of 2015-07-26 14:32 by millert

Remove support for automatically checking files out of RCS.  The
behavior is confusing to users and even GNU patch no longer does
it by default.  OK krw@ guenther@

Revision 1.27.4.1 / (download) - annotate - [select for diffs], Mon Jul 27 16:08:18 2015 UTC (8 years, 9 months ago) by guenther
Branch: OPENBSD_5_6
Changes since 1.27: +2 -11 lines
Diff to previous 1.27 (colored) next main 1.28 (colored)

Backport commit of 2014-11-22 15:49 by tobias:
Remove SCCS support.  For this to work, we would need "get", which we don't     even have in ports.  XSI functionality of POSIX, therefore optional.

ok deraadt, schwarze, tedu

Revision 1.30 / (download) - annotate - [select for diffs], Sun Jul 26 14:32:19 2015 UTC (8 years, 9 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9, OPENBSD_5_8_BASE, OPENBSD_5_8
Changes since 1.29: +2 -11 lines
Diff to previous 1.29 (colored)

Remove support for automatically checking files out of RCS.  The
behavior is confusing to users and even GNU patch no longer does
it by default.  OK krw@ guenther@

Revision 1.29 / (download) - annotate - [select for diffs], Fri Mar 13 19:58:41 2015 UTC (9 years, 2 months ago) by jmc
Branch: MAIN
Changes since 1.28: +3 -3 lines
Diff to previous 1.28 (colored)

remove the first comma from constructs like ", and," and ", or,": you can use
"and" and "or" to join sentence clauses, and you can use commas, but both hinders
reading;

Revision 1.28 / (download) - annotate - [select for diffs], Sat Nov 22 15:49:28 2014 UTC (9 years, 5 months ago) by tobias
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE
Branch point for: OPENBSD_5_7
Changes since 1.27: +4 -4 lines
Diff to previous 1.27 (colored)

Remove SCCS support.  For this to work, we would need "get", which we don't
even have in ports.  XSI functionality of POSIX, therefore optional.

ok deraadt, schwarze, tedu

Revision 1.27 / (download) - annotate - [select for diffs], Tue Apr 15 06:26:54 2014 UTC (10 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE
Branch point for: OPENBSD_5_6
Changes since 1.26: +5 -8 lines
Diff to previous 1.26 (colored)

patch was moved from user portability (UP) to base in issue 7
and is no longer optional;

Revision 1.26 / (download) - annotate - [select for diffs], Fri Sep 3 11:09:29 2010 UTC (13 years, 8 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE, OPENBSD_5_5, OPENBSD_5_4_BASE, OPENBSD_5_4, OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.25: +17 -17 lines
Diff to previous 1.25 (colored)

add an EXIT STATUS section for /usr/bin;

Revision 1.25 / (download) - annotate - [select for diffs], Sun Feb 8 17:33:01 2009 UTC (15 years, 3 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7, OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.24: +3 -3 lines
Diff to previous 1.24 (colored)

updates to IEEE Std 1003.1-2008;

Revision 1.24 / (download) - annotate - [select for diffs], Sun Feb 8 17:15:10 2009 UTC (15 years, 3 months ago) by jmc
Branch: MAIN
Changes since 1.23: +5 -5 lines
Diff to previous 1.23 (colored)

bump the posix reference in STANDARDS to IEEE Std 1003.1-2008, with a few
updates to follow;

Revision 1.23 / (download) - annotate - [select for diffs], Sun Oct 19 06:15:13 2008 UTC (15 years, 7 months ago) by jmc
Branch: MAIN
Changes since 1.22: +3 -3 lines
Diff to previous 1.22 (colored)

over-rule -> overrule; from Thomas Pfaff

Revision 1.22 / (download) - annotate - [select for diffs], Fri Jun 6 20:44:00 2008 UTC (15 years, 11 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE, OPENBSD_4_4
Changes since 1.21: +14 -7 lines
Diff to previous 1.21 (colored)

update the description of -b and STANDARDS; suggested by grunk
ok millert

Revision 1.21 / (download) - annotate - [select for diffs], Fri Jan 11 20:16:02 2008 UTC (16 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.20: +4 -5 lines
Diff to previous 1.20 (colored)

providing MLINKS for shell builtins makes little sense: what we had was out
of date for ever (no ksh builtins), and since we have two shells, pointing
to one page or the other is never going to work; so remove MLINKS for
csh(1); the cd(1) and wait(1) pages (also builtins); and update any trailing
Xr's;

please, there are tools like whence, man, and locate for finding this stuff;

ok deraadt miod

Revision 1.20 / (download) - annotate - [select for diffs], Thu May 31 19:20:14 2007 UTC (16 years, 11 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2
Changes since 1.19: +2 -2 lines
Diff to previous 1.19 (colored)

convert to new .Dd format;

Revision 1.19 / (download) - annotate - [select for diffs], Thu May 31 17:59:39 2007 UTC (16 years, 11 months ago) by jmc
Branch: MAIN
Changes since 1.18: +14 -1 lines
Diff to previous 1.18 (colored)

- note some apps which are xpg4, not posix
- note that some apps are optional to posix

after some discussion w/ otto

Revision 1.18 / (download) - annotate - [select for diffs], Wed Apr 18 21:52:24 2007 UTC (17 years, 1 month ago) by sobrado
Branch: MAIN
Changes since 1.17: +90 -52 lines
Diff to previous 1.17 (colored)

adds a detailed synopsis to the man page; sorts options in
the description list and adds missing arguments; syncs usage()

written with a lot of useful advice by jmc@

ok by jmc@

Revision 1.17 / (download) - annotate - [select for diffs], Fri Oct 31 20:20:45 2003 UTC (20 years, 6 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0, OPENBSD_3_9_BASE, OPENBSD_3_9, OPENBSD_3_8_BASE, OPENBSD_3_8, OPENBSD_3_7_BASE, OPENBSD_3_7, OPENBSD_3_6_BASE, OPENBSD_3_6, OPENBSD_3_5_BASE, OPENBSD_3_5
Changes since 1.16: +253 -160 lines
Diff to previous 1.16 (colored)

o fairly major man page reorganization
o add --posix option for strict POSIX conformance
o change filename determination to match GNU patch
Tested by various people, including a full ports build by naddy@

Revision 1.16 / (download) - annotate - [select for diffs], Thu Jul 31 21:07:35 2003 UTC (20 years, 9 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE, OPENBSD_3_4
Changes since 1.15: +1 -3 lines
Diff to previous 1.15 (colored)

Historically, patch would treat a bare -p as -p0.  This contradicts
POSIX and GNU patch has also removed this, so we will too.  No
objections on icb (no one even seemed to know about this "feature").

Revision 1.15 / (download) - annotate - [select for diffs], Wed Jul 30 16:45:44 2003 UTC (20 years, 9 months ago) by millert
Branch: MAIN
Changes since 1.14: +5 -1 lines
Diff to previous 1.14 (colored)

Add POSIX -i option; tedu@ OK

Revision 1.14 / (download) - annotate - [select for diffs], Mon Jul 28 18:34:36 2003 UTC (20 years, 9 months ago) by otto
Branch: MAIN
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored)

Be more exact on how backup files are handled.
ok millert@ tedu@

Revision 1.13 / (download) - annotate - [select for diffs], Mon Jul 28 16:13:53 2003 UTC (20 years, 9 months ago) by millert
Branch: MAIN
Changes since 1.12: +14 -3 lines
Diff to previous 1.12 (colored)

Make patch(1) exit value match POSIX and be consistent with diff.
Comments and OK from otto@

Revision 1.12 / (download) - annotate - [select for diffs], Fri Jul 25 02:12:45 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.11: +17 -9 lines
Diff to previous 1.11 (colored)

Add POSIX -b option but don't change the default beahvior wrt backups
yet.  The old -b option is now -z (matches GNU patch).

Revision 1.11 / (download) - annotate - [select for diffs], Thu Jul 24 14:35:22 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.10: +12 -13 lines
Diff to previous 1.10 (colored)

"options" not "switches"; jmc@ OK
also update Larry's email address while I am at it ;-)

Revision 1.10 / (download) - annotate - [select for diffs], Thu Jul 24 14:29:16 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.9: +5 -19 lines
Diff to previous 1.9 (colored)

Don't talk about ~ and # suffixes for orig and reject files since we
use .orig and .rej.

Revision 1.9 / (download) - annotate - [select for diffs], Thu Jul 24 04:41:19 2003 UTC (20 years, 10 months ago) by jmc
Branch: MAIN
Changes since 1.8: +325 -316 lines
Diff to previous 1.8 (colored)

mdoc version;
ok millert@

Revision 1.8 / (download) - annotate - [select for diffs], Tue Jul 22 20:17:06 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.7: +2 -18 lines
Diff to previous 1.7 (colored)

Use getopt_long() to parse options instead of rolling our own.
OK deraadt@ and otto@

Revision 1.7 / (download) - annotate - [select for diffs], Fri Jul 18 02:00:09 2003 UTC (20 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)

remove junk; ok otto tedu

Revision 1.6 / (download) - annotate - [select for diffs], Tue Feb 18 07:57:49 2003 UTC (21 years, 3 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE, OPENBSD_3_3
Changes since 1.5: +21 -1 lines
Diff to previous 1.5 (colored)

copyrights added;

ed(1): Andrew Moore
patch(1): Larry Wall (thanks espie@ for help with this one)
units(1): Adrian Mariano

Revision 1.5 / (download) - annotate - [select for diffs], Mon Jan 6 08:52:05 2003 UTC (21 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.4: +3 -3 lines
Diff to previous 1.4 (colored)

typo; jmc@prioris.mini.pw.edu.pl

Revision 1.4 / (download) - annotate - [select for diffs], Sat Jun 5 01:21:36 1999 UTC (24 years, 11 months ago) by aaron
Branch: MAIN
CVS Tags: OPENBSD_3_2_BASE, OPENBSD_3_2, OPENBSD_3_1_BASE, OPENBSD_3_1, OPENBSD_3_0_BASE, OPENBSD_3_0, OPENBSD_2_9_BASE, OPENBSD_2_9, OPENBSD_2_8_BASE, OPENBSD_2_8, OPENBSD_2_7_BASE, OPENBSD_2_7, OPENBSD_2_6_BASE, OPENBSD_2_6
Changes since 1.3: +3 -3 lines
Diff to previous 1.3 (colored)

- remove trailing white space
- remove arguments from .Os macros
- remove arguments from .Nm macros, where appropriate
- some more Dq/Sq/Ql insanity
- still lots to do in the usr.bin tree... :/

Revision 1.3 / (download) - annotate - [select for diffs], Wed Nov 25 00:30:25 1998 UTC (25 years, 6 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_5_BASE, OPENBSD_2_5
Changes since 1.2: +12 -1 lines
Diff to previous 1.2 (colored)

add -C

Revision 1.2 / (download) - annotate - [select for diffs], Mon Jun 10 11:21:30 1996 UTC (27 years, 11 months ago) by niklas
Branch: MAIN
CVS Tags: OPENBSD_2_4_BASE, OPENBSD_2_4, OPENBSD_2_3_BASE, OPENBSD_2_3, OPENBSD_2_2_BASE, OPENBSD_2_2, OPENBSD_2_1_BASE, OPENBSD_2_1, OPENBSD_2_0_BASE, OPENBSD_2_0
Changes since 1.1: +24 -24 lines
Diff to previous 1.1 (colored)

Support the long options that FSF's patch version has.  $OpenBSD$ added

Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Wed Oct 18 08:45:55 1995 UTC (28 years, 7 months ago) by deraadt
CVS Tags: netbsd_1_1
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 (colored)

initial import of NetBSD tree

Revision 1.1 / (download) - annotate - [select for diffs], Wed Oct 18 08:45:55 1995 UTC (28 years, 7 months ago) by deraadt
Branch: MAIN

Initial revision

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.