![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.bin / cvs
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.22 / (download) - annotate - [select for diffs], Wed Jul 28 21:19:30 2010 UTC (13 years, 9 months ago) by nicm
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,
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,
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,
HEAD
Changes since 1.21: +2 -1 lines
Diff to previous 1.21 (colored)
Support -U and -C to specify the context length for "cvs diff". This doesn't alter cvs rdiff, where -U and -C are not support by GNU cvs. ok sthen zinovik
Revision 1.21 / (download) - annotate - [select for diffs], Fri Jul 23 21:46:05 2010 UTC (13 years, 9 months ago) by ray
Branch: MAIN
Changes since 1.20: +13 -13 lines
Diff to previous 1.20 (colored)
Reduce variable/function name and whitespace differences between cvs/rcs. OK xsa zinovik
Revision 1.20 / (download) - annotate - [select for diffs], Sun Jun 7 08:39:13 2009 UTC (14 years, 11 months ago) by ray
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE,
OPENBSD_4_7,
OPENBSD_4_6_BASE,
OPENBSD_4_6
Changes since 1.19: +3 -3 lines
Diff to previous 1.19 (colored)
More cvs/diff/rcs convergence: 1. Mostly variable/function renaming, SIZE_T_MAX->SIZE_MAX, and spacing. 2. One strchr -> strncspn. 3. diff had a weird thing where it set file[12] = ofile[12] but never updated file or ofile, then if file and ofile were different it freed it. I removed it. OK millert
Revision 1.19 / (download) - annotate - [select for diffs], Sat Jun 6 14:17:27 2009 UTC (14 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.18: +13 -2 lines
Diff to previous 1.18 (colored)
Sync some rcsdiff changes to cvsdiff. As a side effect, cvs diff -t now works. There should be no functional change otherwise. OK millert
Revision 1.18 / (download) - annotate - [select for diffs], Tue Apr 28 09:05:40 2009 UTC (15 years ago) by sthen
Branch: MAIN
Changes since 1.17: +5 -1 lines
Diff to previous 1.17 (colored)
support some additional diff options: -a, -b, -d, -w ok joris@
Revision 1.17 / (download) - annotate - [select for diffs], Sat Mar 8 20:26:34 2008 UTC (16 years, 2 months ago) by joris
Branch: MAIN
CVS Tags: OPENBSD_4_5_BASE,
OPENBSD_4_5,
OPENBSD_4_4_BASE,
OPENBSD_4_4
Changes since 1.16: +3 -1 lines
Diff to previous 1.16 (colored)
add checkout/update -j support. still has some rough edges.
Revision 1.16 / (download) - annotate - [select for diffs], Wed Feb 27 22:34:04 2008 UTC (16 years, 2 months ago) by joris
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE,
OPENBSD_4_3
Changes since 1.15: +2 -2 lines
Diff to previous 1.15 (colored)
prevent file races ok tobias@
Revision 1.15 / (download) - annotate - [select for diffs], Sun Feb 3 18:18:44 2008 UTC (16 years, 3 months ago) by tobias
Branch: MAIN
Changes since 1.14: +2 -1 lines
Diff to previous 1.14 (colored)
Added rdiff support. In order to do this, some output and option fixes had to be done for diff, too. OK joris@
Revision 1.14 / (download) - annotate - [select for diffs], Sun Jan 28 02:04:45 2007 UTC (17 years, 3 months ago) by joris
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE,
OPENBSD_4_2,
OPENBSD_4_1_BASE,
OPENBSD_4_1
Changes since 1.13: +2 -2 lines
Diff to previous 1.13 (colored)
add merging support in both local and remote sides. tested by many, thanks.
Revision 1.13 / (download) - annotate - [select for diffs], Wed Jun 14 14:10:50 2006 UTC (17 years, 11 months ago) by joris
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE,
OPENBSD_4_0
Changes since 1.12: +2 -2 lines
Diff to previous 1.12 (colored)
add cvs_buf_load_fd() which does the same as cvs_buf_load() except it takes a decriptor as argument instead of a path. modified cvs_buf_load() to open the descriptor then pass it to cvs_buf_load_fd(). change all the calls to cvs_buf_load() that have a descriptor open for the path to cvs_buf_load_fd() to prevent races.
Revision 1.12 / (download) - annotate - [select for diffs], Wed May 31 22:24:12 2006 UTC (17 years, 11 months ago) by joris
Branch: MAIN
Changes since 1.11: +2 -1 lines
Diff to previous 1.11 (colored)
support -p flag for diff, makes dlg@ feel all warm and fuzzie inside.
Revision 1.11 / (download) - annotate - [select for diffs], Sat May 27 03:30:30 2006 UTC (17 years, 11 months ago) by joris
Branch: MAIN
Changes since 1.10: +1 -7 lines
Diff to previous 1.10 (colored)
commit the new opencvs code, i have been hacking on this for the past 2 weeks now and it should go in at the start of the hackathon so others can help out. this code is a lot safer, smarter, faster and best of all it is actually doing what it is suppose to do! basic checkout, update, status, diff and commit are working in local mode only. there is no support for any remote setups now.
Revision 1.10 / (download) - annotate - [select for diffs], Fri Apr 14 23:29:01 2006 UTC (18 years, 1 month ago) by joris
Branch: MAIN
Changes since 1.9: +3 -1 lines
Diff to previous 1.9 (colored)
- don't append the extension if it's already there (PR 5076). - show magic branches in rlog (thanks for that nicer hack niall). - correct output in rcsdiff, so we perfectly match gnu's all these bugs were found by sturm@ while he was using cvsweb (which uses the RCS tools). "it is in my view that you should put it in" niallo@
Revision 1.9 / (download) - annotate - [select for diffs], Mon Apr 10 09:57:32 2006 UTC (18 years, 1 month ago) by xsa
Branch: MAIN
Changes since 1.8: +2 -2 lines
Diff to previous 1.8 (colored)
sync comments with reality.
Revision 1.8 / (download) - annotate - [select for diffs], Tue Mar 14 15:59:06 2006 UTC (18 years, 2 months ago) by xsa
Branch: MAIN
Changes since 1.7: +2 -2 lines
Diff to previous 1.7 (colored)
add an argument to cvs_diff3() to be able to handle verbosity of commands; fixes rcsmerge -q behaviour. OK niallo@ ray@.
Revision 1.7 / (download) - annotate - [select for diffs], Mon Nov 21 15:01:10 2005 UTC (18 years, 6 months ago) by xsa
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE,
OPENBSD_3_9
Changes since 1.6: +4 -3 lines
Diff to previous 1.6 (colored)
- print some more informative messages - minor knf niallo ok
Revision 1.6 / (download) - annotate - [select for diffs], Wed Oct 26 18:13:58 2005 UTC (18 years, 6 months ago) by xsa
Branch: MAIN
Changes since 1.5: +2 -1 lines
Diff to previous 1.5 (colored)
diff3_conflicts cleanup; joris ok
Revision 1.5 / (download) - annotate - [select for diffs], Sat Oct 22 19:05:25 2005 UTC (18 years, 7 months ago) by joris
Branch: MAIN
Changes since 1.4: +5 -1 lines
Diff to previous 1.4 (colored)
fix warning when compiling usr.bin/rcs
Revision 1.4 / (download) - annotate - [select for diffs], Sat Oct 22 17:32:57 2005 UTC (18 years, 7 months ago) by joris
Branch: MAIN
Changes since 1.3: +7 -2 lines
Diff to previous 1.3 (colored)
diff3 support, needed for merging files together; "go for it" niallo@
Revision 1.3 / (download) - annotate - [select for diffs], Tue Oct 11 14:27:27 2005 UTC (18 years, 7 months ago) by joris
Branch: MAIN
Changes since 1.2: +2 -1 lines
Diff to previous 1.2 (colored)
export diff_file variable so it can be set from without diff functions; ok niallo@
Revision 1.2 / (download) - annotate - [select for diffs], Fri Oct 7 23:59:56 2005 UTC (18 years, 7 months ago) by niallo
Branch: MAIN
Changes since 1.1: +3 -2 lines
Diff to previous 1.1 (colored)
basic `ci' support is here! more coming soon. combined effort with joris. ok joris@
Revision 1.1 / (download) - annotate - [select for diffs], Wed Oct 5 23:11:07 2005 UTC (18 years, 7 months ago) by niallo
Branch: MAIN
- add a diff.h header file, corresponding to public functions in diff.c and some #defines - include this header in rcs.c - link rcs against diff.c this allows us to use the existing diff work from opencvs within functions in the rcs.c API and thus in rcs programs. paves the way for diff support in usr.bin/rcs programs. ok joris@