Commit Graph

233 Commits

Author SHA1 Message Date
obrien
64a55bfcba Add $FreeBSD$ since we now have local changes. 2008-06-16 17:06:17 +00:00
obrien
9b68850f89 Optimize the CVS bug fix by relaxing the conditions for update
with respect to sticky options.  (r179561 was WRT sticky and branch tags)

Consulted with: Mark Baushke <mdb@gnu.org>
2008-06-06 16:16:44 +00:00
obrien
c2693f72a0 Optimize the CVS bug fix by relaxing the conditions for update. 2008-06-05 15:09:53 +00:00
obrien
c3a2df13fc List of files that are off the vendor branch, but we use the stock vendor
files.
2008-04-24 18:23:13 +00:00
obrien
b106211ee7 Remove FreeBSD ID's so these are exact copies of the vendor sources. 2008-04-24 18:18:53 +00:00
obrien
3f0e456a87 Remove FreeBSD ID's so these are exact copies of the vendor sources. 2008-03-19 15:15:26 +00:00
obrien
4f8541364a We use the stock versions of these files. 2008-03-19 15:11:46 +00:00
obrien
a7ab5964bd Merge rev 1.9 (new long flag to ignore the CVSROOT/passwd file)
rev 1.2 (local tag/$Id$ keyword support)  into version 1.11-20080310.
2008-03-19 15:08:01 +00:00
obrien
41abcd97db Merge rev 1.9 (update "-T" Template support) and rev 1.2 (-D'date'
option with -r'branch' on update)  into version 1.11-20080310.
2008-03-19 15:07:28 +00:00
obrien
9452bc826e Merge rev 1.28 (CAN-2005-0753 / FreeBSD-SA-05:05.cvs fixes),
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.
2008-03-19 15:06:50 +00:00
obrien
f9e077664c 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-20080310.
Note the vendor has also added some forward compatability support.
We should determine if we can live with just the vendor's method.
2008-03-19 15:05:27 +00:00
obrien
17bdda65ae Merge rev 1.25 ("iso8601" option keyword), 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-20080310.  Note the vendor accepted my "blame" alias.
2008-03-19 15:00:43 +00:00
obrien
dad94cb32c Merge rev. 1.2 ("iso8601" option keyword) into version 1.11-20080310.
Note the vendor added our '-n' feature to the offical code base.
2008-03-19 14:56:41 +00:00
obrien
26f2567ec0 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-20080310.
2008-03-19 14:55:59 +00:00
obrien
155695a36e Merge rev 1.21: change default from "rsh" to "ssh", 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-20080310.
2008-03-19 14:50:22 +00:00
obrien
5d4972e829 Merge rev 1.7: always upload new files, even if the timestamps match,
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-20080310.

Note that rev 1.4 (default CVS_RSH to "ssh") will not be handled thru the
vendor's config.h.
2008-03-19 14:49:14 +00:00
obrien
1c0cbce33a This commit was generated by cvs2svn to compensate for changes in r177391,
which included commits to RCS files with non-trunk default branches.
2008-03-19 14:46:59 +00:00
obrien
c54c20f642 Import of 1.11 branch snapshot - using the 10-March-2008 code base. 2008-03-19 14:46:59 +00:00
obrien
44e353d96e egad! The cvs 1.11.22 distribution had a Linux binary in it. Yuck. 2008-03-17 07:57:38 +00:00
obrien
364a5112a5 Update for the 1.11.22 import.
Reviewed/begged-for by: peter
2008-01-13 06:35:22 +00:00
obrien
5f43f46b30 2004-09-25 Derek Price <derek@ximbiot.com>
* mkman.in: Move to...
	* mkman.pl: ...here.
2008-01-13 06:24:49 +00:00
obrien
a7a5f3ec02 This commit was generated by cvs2svn to compensate for changes in r175283,
which included commits to RCS files with non-trunk default branches.
2008-01-13 06:24:49 +00:00
obrien
e4554e6a56 We use the stock versions of these files.
Reviewed/begged-for by: peter
2008-01-13 06:20:11 +00:00
obrien
6cd2d59484 Merge what 1.11.17 -> 1.11.22 ../doc/cvs.1 changes I could.
We never merged in the 1.11.15 -> 1.11.17 changes - due to the moving
of cvs.1 from man/ to doc/ and being auto generated.
2008-01-13 06:14:29 +00:00
obrien
b33160d3d4 Merge rev 1.9 (update "-T" Template support) and rev 1.2 (-D'date'
option with -r'branch' on update) into version 1.11.22.
2008-01-13 06:13:25 +00:00
obrien
c9aa26049e Merge rev 1.9 (new long flag to ignore the CVSROOT/passwd file)
rev 1.2 (local tag/$Id$ keyword support)  into version 1.11.22.
2008-01-13 06:12:54 +00:00
obrien
6ff32b5cd2 Merge rev 1.28 (CAN-2005-0753 / FreeBSD-SA-05:05.cvs fixes),
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
2008-01-13 06:12:27 +00:00
obrien
9d9d59dd54 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
obrien
7575169e50 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
obrien
89cdc74185 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
obrien
8981de8610 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
obrien
c2c220d228 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
obrien
1d7ee3ab51 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
obrien
31b70a95c6 Merge revs 1.2 (comprehensive CVS/Template support) into version 1.11.22. 2008-01-13 06:07:20 +00:00
obrien
c63d336bc9 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
obrien
d2efc9179e 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
obrien
5ed02a66eb 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
obrien
f8bcc52bc3 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
obrien
6569844331 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
obrien
8120aecbe7 Merge our -T comprehensive CVS/Template support into cvs 1.11.22. 2008-01-13 06:00:42 +00:00
obrien
17d5b79080 Update for the 1.11.22 import. 2008-01-13 05:50:33 +00:00
obrien
55b663837d Import cvs-1.11.22 onto vendor branch. 2008-01-13 05:49:32 +00:00
obrien
def79099e7 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
peter
2bb84b573e 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
obrien
a836858474 Reduce diffs to vendor's 1.11.17. 2007-12-31 03:42:05 +00:00
obrien
d4da9a4a18 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
cperciva
b5dafedcd7 Correct insecure temporary file usage.
Security:	FreeBSD-SA-05:20.cvsbug
2005-09-07 13:39:44 +00:00
keramida
e19c1e09f5 Spell "committing" correctly. 2005-07-28 13:53:45 +00:00
simon
40aaae3b1a 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
des
79a91ff42c 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