David E. O'Brien
688d0df11b
Merge rev 1.11 ("iso8601" option keyword) into version 1.11.22.
...
(all our other local changes are OBE)
2008-01-13 06:11:36 +00:00
David E. O'Brien
51e347cf4c
Merge rev 1.2 (extensions to the $CVSROOT/config syntax) and
...
rev 1.4 (1.12 CVSROOT/config keyword expansion forward compatability)
into version 1.11.22.
2008-01-13 06:10:58 +00:00
David E. O'Brien
ea7768f3aa
Merge rev 1.25 ("iso8601" option keyword), rev 1.23 (blame),
...
rev 1.17 (environtmental var "CVS_OPTIONS"), rev 1.14 ('-g' option to
support shared-group access), rev 1.7 ('-R' read-only repository mode),
rev 1.6 (support for checking out from a read-only repository),
revs 1.4 & 1.5 ("tagexpand=") into version 1.11.22.
2008-01-13 06:10:18 +00:00
David E. O'Brien
78d59c12d4
Merge rev 1.9 (put the blank line back in the beginning of constructed
...
log messages being passed to $EDITOR) into version 1.11.22.
2008-01-13 06:09:41 +00:00
David E. O'Brien
469909901f
Merge rev 1.3 ('-n' option) & rev. 1.2 ("iso8601" option keyword)
...
into version 1.11.22.
2008-01-13 06:08:49 +00:00
David E. O'Brien
fff17d416c
Merge rev 1.3 (catch write-lock attempts immediately if running in
...
read-only mode) & rev 1.2 (check out from read-only repository support)
into version 1.11.22.
2008-01-13 06:08:17 +00:00
David E. O'Brien
cf7a6ed752
Merge revs 1.2 (comprehensive CVS/Template support) into version 1.11.22.
2008-01-13 06:07:20 +00:00
David E. O'Brien
d304d2a774
Merge rev 1.2 (do not check val-tags if the repository is read-only)
...
into version 1.11.22.
2008-01-13 06:06:41 +00:00
David E. O'Brien
5508baed23
Toss all of our local changes - they are OBE.
...
However, stay with version 1.9.26's buflen of BUFSIZ as we have in the
past vs. going with the 1.10+ limited length of 128.
2008-01-13 06:06:15 +00:00
David E. O'Brien
af9bb1d630
Merge rev 1.16: implement -j for cvs diff, allowing tag:date based diffs
...
into version 1.11.22.
2008-01-13 06:05:24 +00:00
David E. O'Brien
1b60ed3476
Change default from rsh to ssh. (moved from client.c).
...
Merge rev 1.14: comprehensive -T CVS/Template support, rev 1.9: new long
flag that causes cvs to ignore the CVSROOT/passwd file, rev 1.3: support
for checking out from a read-only repository, rev. 1.2: support for local
$Id$ keyword into cvs 1.11.22.
Note that rev 1.4 (make verifymsg extra useful) is OBE.
2008-01-13 06:04:43 +00:00
David E. O'Brien
eb29efdd21
Merge rev 1.7: always upload new files, even if the timestamps match,
...
rev 1.4: flip the default for CVS_RSH to "ssh", rev 1.2: fix a problem
sometimes seen when doing checkouts from a local repo and committing
via remote cvs (a cvs -d override of the mismatched CVS/Root files was
missing) into cvs 1.11.22.
2008-01-13 06:02:28 +00:00
David E. O'Brien
69d204771d
Merge our -T comprehensive CVS/Template support into cvs 1.11.22.
2008-01-13 06:00:42 +00:00
David E. O'Brien
5a71bb8e41
Update for the 1.11.22 import.
2008-01-13 05:50:33 +00:00
David E. O'Brien
8c012b9f91
This commit was generated by cvs2svn to compensate for changes in r175261,
...
which included commits to RCS files with non-trunk default branches.
2008-01-13 05:49:32 +00:00
David E. O'Brien
cf9c5c1a56
Import cvs-1.11.22 onto vendor branch.
2008-01-13 05:49:32 +00:00
Peter Wemm
aa0eaafee0
Add a forward compatability hook so that current cvs can recognize future
...
CVSROOT/config file options that control keyword expansion. cvs-1.12 has
its own $Id$ expansion controls and they're configured in CVSROOT/config
rather than CVSROOT/options. The problem is that current cvs-1.11.x
doesn't understand the future keywords.....
Add trivial forward support for the new keywords for when cvs-1.12
hits the tree down the road. CVSROOT/options won't be going away - cvsup
uses it.
2008-01-07 07:47:21 +00:00
David E. O'Brien
c24c464544
Reduce diffs to vendor's 1.11.17.
2007-12-31 03:42:05 +00:00
David E. O'Brien
bc6d91c4b6
Add the '-n' option which is the opposite of '-N', "Do not list tags."
...
The '-n' option is needed when one has "log -N" in their ~/.cvsrc, but
wishes to see tags for a particular invocation.
2006-12-12 03:20:36 +00:00
Colin Percival
9020d67cf5
Correct insecure temporary file usage.
...
Security: FreeBSD-SA-05:20.cvsbug
2005-09-07 13:39:44 +00:00
Giorgos Keramidas
d136945536
Spell "committing" correctly.
2005-07-28 13:53:45 +00:00
Simon L. B. Nielsen
31363b6067
Correct multiple security related errors: a buffer overflow, NULL
...
pointer dereferences, possible use of uninitialized variables, and
memory leaks.
Security: CAN-2005-0753
Security: FreeBSD-SA-05:05.cvs
Approved by: peter
2005-04-22 17:58:25 +00:00
Dag-Erling Smørgrav
40bce2b2a1
Do not check val-tags if the repository is read-only.
...
Approved by: maintainer's silence
MFC after: 2 weeks
2004-08-05 17:47:35 +00:00
Dag-Erling Smørgrav
8290e396fb
Add an "iso8601" option keyword which causes 'cvs log' etc. to print
...
dates in ISO 8601 format.
Approved by: peter
MFC after: 2 weeks
2004-07-06 08:10:38 +00:00
Peter Wemm
c21444aae2
Merge 1.11.15+ -> 1.11.17 changes onto mainline. I've left cvs.1 alone
...
for now.
2004-06-10 19:12:50 +00:00
Peter Wemm
83c36f7f98
Import cvs-1.11.17 onto vendor branch.
2004-06-10 19:05:38 +00:00
Peter Wemm
1df53a9a3f
This commit was generated by cvs2svn to compensate for changes in r130303,
...
which included commits to RCS files with non-trunk default branches.
2004-06-10 19:05:38 +00:00
Dag-Erling Smørgrav
782de70aff
The list of files / directories to remove has moved to FREEBSD-Xlist.
2004-06-09 20:51:26 +00:00
Dag-Erling Smørgrav
4abf92e4b8
List of files and directories to delete before importing a new release.
2004-06-09 20:14:53 +00:00
Dag-Erling Smørgrav
62fcc3d3d0
Merge updated patch from vendor branch (1.1.1.17)
2004-05-20 13:17:16 +00:00
Dag-Erling Smørgrav
b0e9f4d203
The previous commit broke compatibility with certain buggy third-party
...
CVS clients. This commit fixes that and brings this file up-to-date
with CVS 1.1.16.
Obtained from: ccvs.cvshome.org
2004-05-20 13:11:32 +00:00
Dag-Erling Smørgrav
ab203c2d8c
Merge parser fix from vendor branch (rev 1.1.1.16)
2004-05-19 06:21:56 +00:00
Dag-Erling Smørgrav
f6fb3b4a3a
Fix a couple of parser bugs.
2004-05-19 06:11:44 +00:00
Peter Wemm
9dc16a5e25
Change WriteTemplate to take const char * args.
...
The Name_Root() call seems to be defunct, remove it because it was
causing compile problems. The real magic seems to be in the Parse_Info()
callback (which was also updated for const char * args).
2004-04-15 01:41:05 +00:00
Peter Wemm
091764700c
Fix merge typo. Add missing ",".
2004-04-15 01:31:28 +00:00
Peter Wemm
e9701b59b1
File removed from vendor branch
2004-04-15 01:19:11 +00:00
Peter Wemm
36b42f0be0
This commit was generated by cvs2svn to compensate for changes in r128270,
...
which included commits to RCS files with non-trunk default branches.
2004-04-15 01:19:11 +00:00
Peter Wemm
25773c5448
Initial merge of cvs-1.11.5 -> 1.11.15 changes onto mainline
2004-04-15 01:17:28 +00:00
Peter Wemm
10bfecb8b5
Import cvs-1.11.15
2004-04-15 01:01:56 +00:00
Peter Wemm
edc4a449d1
This commit was generated by cvs2svn to compensate for changes in r128266,
...
which included commits to RCS files with non-trunk default branches.
2004-04-15 01:01:56 +00:00
Jacques Vidrine
462959355e
Merge security fix from vendor branch (revision 1.1.1.14).
2004-01-21 16:29:16 +00:00
Jacques Vidrine
c8ae5f0562
Incorporate two security fixes from later versions of CVS.
...
From the NEWS file of cvs 1.11.11:
* pserver can no longer be configured to run as root via the
$CVSROOT/CVSROOT/passwd file, so if your passwd file is
compromised, it no longer leads directly to a root hack. Attempts
to root will also be logged via the syslog.
* Malformed module requests could cause the CVS server to attempt
to create directories and possibly files at the root of the
filesystem holding the CVS repository. Filesystem permissions
usually prevent the creation of these misplaced directories, but
nevertheless, the CVS server now rejects the malformed requests.
Obtained from: ccvs.cvshome.org
2004-01-21 16:27:56 +00:00
Jacques Vidrine
4db0ba50f1
This commit was generated by cvs2svn to compensate for changes in r124793,
...
which included commits to RCS files with non-trunk default branches.
2004-01-21 16:27:56 +00:00
David E. O'Brien
f53fef5bbe
Document CVS_CLIENT_PORT.
2003-11-13 17:57:53 +00:00
David E. O'Brien
e220ac8c40
Add "blame" as an "annotate" alias for interoperability with subversion.
2003-07-07 19:15:36 +00:00
Dag-Erling Smørgrav
b5bd3dd547
Add support for OpenBSD extensions to the $CVSROOT/config syntax.
...
Approved by: peter
Obtained from: OpenBSD
2003-03-20 11:05:48 +00:00
Peter Wemm
fd98984aaf
Turn off Checkin-prog and Update-prog.
2003-01-21 22:10:13 +00:00
Peter Wemm
794bef18e7
This file is gone on the vendor branch and no longer referenced in the
...
source.
2003-01-21 22:02:26 +00:00
Peter Wemm
27e93a05a2
This commit was generated by cvs2svn to compensate for changes in r109661,
...
which included commits to RCS files with non-trunk default branches.
2003-01-21 22:02:26 +00:00
Peter Wemm
9de666118b
Merge cvs-1.11.2.1-20021201 -> 1.11.5 changes onto mainline
2003-01-21 22:01:38 +00:00