summaryrefslogtreecommitdiffstats
path: root/contrib/cvs/src/rcs.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge rev 1.28 (CAN-2005-0753 / FreeBSD-SA-05:05.cvs fixes),obrien2008-03-191-170/+267
| | | | | | rev 1.27 ("iso8601" option keyword) revs 1.12/1.10/1.5/1.4 ($CVSHeader$ support) rev 1.2 ($CVS_LOCAL_BRANCH_NUM support for local commit feature of cvsup) into version 1.11-20080310.
* Merge rev 1.28 (CAN-2005-0753 / FreeBSD-SA-05:05.cvs fixes),obrien2008-01-131-80/+296
| | | | | | | | | | rev 1.27 ("iso8601" option keyword) revs 1.12/1.10/1.5/1.4 ($CVSHeader$ support) rev 1.2 ($CVS_LOCAL_BRANCH_NUM support for local commit feature of cvsup) into version 1.11.22. Note rev 1.21 ("-D date" checkout bug relating to 1.1.1.1 vs 1.1 revisions), rev 1.13 (allow -D'date' with -r'branch' on a checkout), rev 1.6 (use xstrdup rather than strdup) are fixed in the vendor sources
* Correct multiple security related errors: a buffer overflow, NULLsimon2005-04-221-4/+5
| | | | | | | | | pointer dereferences, possible use of uninitialized variables, and memory leaks. Security: CAN-2005-0753 Security: FreeBSD-SA-05:05.cvs Approved by: peter
* Add an "iso8601" option keyword which causes 'cvs log' etc. to printdes2004-07-061-2/+3
| | | | | | | dates in ISO 8601 format. Approved by: peter MFC after: 2 weeks
* Initial merge of cvs-1.11.5 -> 1.11.15 changes onto mainlinepeter2004-04-151-259/+314
|
* Merge cvs-1.11.2.1-20021201 -> 1.11.5 changes onto mainlinepeter2003-01-211-2/+2
|
* Merge 1.11.2 -> 1.11.2.1-20021201 changes onto mainlinepeter2002-12-021-15/+14
| | | | Approved by: re
* Initial merge of 1.11.1p1 -> 1.11.2 changes onto mainlinepeter2002-09-021-52/+197
|
* Initial merge of cvs-1.11 -> 1.11.1p1 changes onto mainline. There ispeter2001-08-101-196/+50
| | | | still some suspicious and/or broken stuff to fix yet.
* Fix a bug that shows up when checking out files by date with thejdp2000-10-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | "-D date" command line option. There is code in the original to handle a special case. If the date search finds revision 1.1 it is supposed to check whether revision 1.1.1.1 has the same date stamp, which would indicate that the file was originally brought in with "cvs import". In that case it is supposed to return the vendor branch version 1.1.1.1. However, there is a bug in the code. It actually compares the date of revision 1.1 for equality with the date given on the command line -- clearly wrong. This commit fixes the coding bug. There is an additional bug which is _not_ fixed in this commit. The date comparison should not be a strict equality test. It should allow a fudge factor of, say, 2-3 seconds. Old versions of CVS created the two revisions with two separate invocations of the RCS "ci" command. We have many old files in the tree in which the dates of revisions 1.1 and 1.1.1.1 differ by 1 second. Approved by: peter
* Merge changes from 1.10.7 -> 1.11 into mainline. Note that the oldpeter2000-10-021-591/+260
| | | | anoncvs no-password hack is gone and is replaced by the official version.
* Merge error. rcs_lockfile is freed after unlock.peter1999-12-111-2/+0
|
* Merge cyclic changes for 1.10.7 only our mainline.peter1999-12-111-98/+318
|
* Merge cvs-1.9.xx -> 1.10 changes onto mainline.peter1999-03-181-103/+958
| | | | | Changes of significance include the top level CVS directory being optional and defaulting to off..
* Tweak from the cvs sources just after the 1.9.26 release:peter1998-03-111-1/+1
| | | | | | | | 1998-03-07 Tim Pierce <twp@skepsis.com> * rcs.c (RCS_checkout): Negation bug when checking out symlinks: existence_error should be !existence_error. This shouldn't cause any major merge problems later.
* Merge changes from vendor branch into mainlinepeter1998-03-101-656/+1793
|
* Merge changes from CYCLIC onto main branchpeter1998-01-261-465/+2879
|
* Allow a -D'date' option to be included with a -r'branch'julian1998-01-121-3/+3
| | | | | | | | | | | | | | on a checkout. this allows us to do: cd /usr/src/sys cvs update -rRELENGE_2_2 -D"Yesterday" which has been a feature sorely needed for any project with active branches. warning: this breaks on usr.sbin/pkg_install for some reason. everything else works as advertised. (other things allready break on pkg_install, so it's not the fault of this patch, it just falls faul of another bug somewhere) If I had more time I'd make -r always accept the same syntax as -j (tag:data)
* Fix a braino in the Attic/ removal code for $CVSHeader$ that originatedpeter1997-08-221-1/+1
| | | | | | | from XFree86. I think this was harmless, the strncmp happened always rather than being optimised out. Submitted by: jdp
* oops, missed a debug printf somehow..peter1997-08-191-1/+0
|
* Redo the $CVSHeader$ support to use code similar to that from David Dawespeter1997-08-191-20/+32
| | | | | | but adapted to run within cvs instead of rcs. The stuff I hacked together didn't strip out "/Attic/" for files on branches when the HEAD version was cvs rm'ed.
* merge conflictspeter1997-06-221-2/+10
|
* If the localid is set, don't forget to expand it...peter1997-06-021-0/+1
|
* Merge conflicts from 970523 importpeter1997-05-231-0/+2
|
* use xstrdup rather than strdup in case of malloc failure.peter1997-05-171-3/+3
|
* Complete the support for $FreeBSD$. Add an option "tagexpand=" whichpeter1997-05-171-20/+123
| | | | | | | | | | | | | | | | controls the RCSINCEXC encironment variable for our rcs version, and also convert the rest of the checkout enhancements from rcs into cvs's fast checkout code. (yes, cvs doesn't call 'co' anymore) We now have fine grained individual keyword expansion control and can set the keyword to anything the user wants. Also, a new keyword, $CVSHeader$ comes in from rcs, it's like $Header$ except that it shows the pathname relative to the cvsroot. eg: $FreeBSD: src/bin/ls/ls.c,v 1.10.2.14 1997/05/17 13:15:45 peter Exp $ ^^^^^^^^^^^^^^^^^ The idea for this comes from $XFree86$ which expands like $CVSHeader$. The "local id" string can be set to expand like Id, Header or CVSHeader. (Matching support for this is apparently happening in cvsup right now)
* Initial round of support for a local $Id$ keyword in cvs, eg: $FreeBSD$.peter1997-05-161-2/+10
| | | | | | | This is not complete yet in that it doesn't drive our version of RCS completely, but it does work fine when you do the appropriate magic. Obtained from: OpenBSD source tree
* Merge import conflictspeter1997-05-151-397/+2401
|
* Implement a horrible (but simple) hack to allow some control over thepeter1996-09-031-2/+14
| | | | | | | | | | | | branch number that is assigned. This is specifically to support the local commit feature of cvsup. If one sets $CVS_LOCAL_BRANCH_NUM to (say) 1000 then branches the local repository, the revision numbers will look like 1.66.1000.xx. This is almost a dead-set certainty that there will be no conflicts with version numbers. :-) (This needs to be something more than an option to 'cvs tag' or 'cvs rtag' as various parts of cvs "know" how to automatically branch files (eg: cvs add). Trying to remember state is getting "Too Hard (TM)")
* Import of slightly trimmed cvs-1.8 distribution. Generated filespeter1996-08-201-0/+2262
and non-unix code has been left out.
OpenPOWER on IntegriCloud