OpenBSD CVS

CVS log for src/usr.bin/rcs/merge.c


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

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.10 / (download) - annotate - [select for diffs], Fri Aug 26 09:02:54 2016 UTC (7 years, 8 months ago) by guenther
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, 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, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1, HEAD
Changes since 1.9: +2 -1 lines
Diff to previous 1.9 (colored)

Pull in <time.h> for struct tm, used in rcs.h

ok deraadt@

Revision 1.9 / (download) - annotate - [select for diffs], Fri Oct 10 08:15:25 2014 UTC (9 years, 7 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9, OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.8: +1 -2 lines
Diff to previous 1.8 (colored)

Zap some stored values never read; From Fritjof Bornebusch; ok nicm@

Revision 1.8 / (download) - annotate - [select for diffs], Thu Oct 2 06:23:15 2014 UTC (9 years, 7 months ago) by otto
Branch: MAIN
Changes since 1.7: +4 -4 lines
Diff to previous 1.7 (colored)

exit in usage functions themselves; from  Fritjof Bornebusch; ok nicm@

Revision 1.7 / (download) - annotate - [select for diffs], Fri Jul 23 21:46:05 2010 UTC (13 years, 9 months ago) by ray
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, 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, OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.6: +5 -5 lines
Diff to previous 1.6 (colored)

Reduce variable/function name and whitespace differences between
cvs/rcs.

OK xsa zinovik

Revision 1.6 / (download) - annotate - [select for diffs], Thu Apr 26 21:49:33 2007 UTC (17 years ago) by sobrado
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7, OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5, OPENBSD_4_4_BASE, OPENBSD_4_4, OPENBSD_4_3_BASE, OPENBSD_4_3, OPENBSD_4_2_BASE, OPENBSD_4_2
Changes since 1.5: +2 -3 lines
Diff to previous 1.5 (colored)

compatibility (`do nothing') options do not need to be announced
in the synopsis/usage(); we do not want `[-L label]' three times

ok by jmc@, niallo@, and xsa@

Revision 1.5 / (download) - annotate - [select for diffs], Tue Feb 27 07:59:13 2007 UTC (17 years, 2 months ago) by xsa
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1
Changes since 1.4: +5 -2 lines
Diff to previous 1.4 (colored)

As done in OpenCVS, general includes cleanup sweep. OK otto@.

Revision 1.4 / (download) - annotate - [select for diffs], Fri Aug 11 08:18:19 2006 UTC (17 years, 9 months ago) by xsa
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.3: +12 -4 lines
Diff to previous 1.3 (colored)

correctly handle merge(1) and rcsmerge(1) -e and -E flags; tests and OK ray@.

Revision 1.3 / (download) - annotate - [select for diffs], Tue Aug 1 05:14:17 2006 UTC (17 years, 9 months ago) by ray
Branch: MAIN
Changes since 1.2: +5 -10 lines
Diff to previous 1.2 (colored)

Reduce rcs_buf_release() usage, improving binary support.

OK niallo@

Revision 1.2 / (download) - annotate - [select for diffs], Mon May 15 06:58:03 2006 UTC (18 years ago) by xsa
Branch: MAIN
Changes since 1.1: +32 -4 lines
Diff to previous 1.1 (colored)

missing bits for a working merge(1). Built and enabled.
OK joris@ ray@.

Revision 1.1 / (download) - annotate - [select for diffs], Wed May 10 14:28:17 2006 UTC (18 years ago) by xsa
Branch: MAIN

starting bits for merge(1) replacement. Not built/linked yet.
man page reviewed by jmc@.

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.