Commit Graph

152 Commits

Author SHA1 Message Date
peter
ce098c03a4 Merge 1.11.2 -> 1.11.2.1-20021201 changes onto mainline
Approved by:	re
2002-12-02 03:17:49 +00:00
peter
c88e730141 This commit was generated by cvs2svn to compensate for changes in r107484,
which included commits to RCS files with non-trunk default branches.
2002-12-02 03:13:37 +00:00
peter
3dc96f7243 Import cvs-1.11.2.1 as of 2002/12/01 onto vendor branch. This fixes all
of the bugs that I know of.  We've been running a slightly older version
of this on freefall/repoman, where it was afflicted by a silly merge error
on my part (fixed).

Approved by:  re
2002-12-02 03:13:37 +00:00
peter
9ebea44a28 Fix a cvs server bug introduced in 1.11.2, in the words of the author:
---
Fix communication hanging in communication shutdown phase, caused by at
least older CVS clients (version < 1.11.2) and a semantically incorrect
usage of getc() by the server.
---

getc() was being used on a blocking socket/pipe.

Submitted by:   rse
2002-09-02 07:58:04 +00:00
peter
a34725cd3a Repo copy these files to the bmake area, these are not part of the
cvs vendor release and should not have been 'cvs add'ed there in
the first place.
2002-09-02 06:09:03 +00:00
peter
ca4ebacf48 Remove these files from the vendor branch, they are no longer in 1.11.2 2002-09-02 06:02:40 +00:00
peter
1ab798bddc Minor updates after 1.11.2 import 2002-09-02 05:58:30 +00:00
peter
a2b6a3a9b8 Initial merge of 1.11.1p1 -> 1.11.2 changes onto mainline 2002-09-02 05:57:14 +00:00
peter
cf46dfb750 Import cvs-1.11.2 onto vendor branch
Obtained from: http://www.cvshome.org/
2002-09-02 05:50:28 +00:00
peter
9977823bcf This commit was generated by cvs2svn to compensate for changes in r102840,
which included commits to RCS files with non-trunk default branches.
2002-09-02 05:50:28 +00:00
fenner
aeccf286e8 Always upload new files, even if the timestamps match. This is a workaround
for the trouble that DES and I had with MFCs: when "cvs update -jfoo -jbar"
creates a new file, it sets the version to 0 ("new") but sets the timestamp
in the Entries file to the timestamp of the file that's new on the branch.
The CVS client doesn't upload files whose timestamps match with the Entries
file, so these new files don't get uploaded to the server and the server
fails when trying to check them in.

PR:		bin/40227
Approved by:	peter
MFC after:	2 weeks
2002-07-08 10:05:26 +00:00
keramida
97d1ceb026 CVS_RSH defaults to 'ssh' these days, and not 'rsh'.
PR:		docs/37429
Submitted by:	Martin v. Löwis <martin@v.loewis.de>
Reviewed by:	peter
2002-05-12 02:12:04 +00:00
dillon
e67d87ef7c oops, forgot to commit man page for cvs changes 2001-09-21 19:05:36 +00:00
dillon
903a77c857 Implement comprehensive CVS/Template support to complement the Template
support that already exists for checkout.  The -T option for cvs update
and cvs checkout may be used to cause CVS to retrieve/update the checkin
template when possible.

MFC after:	1 week
2001-09-15 05:57:52 +00:00
dillon
41d5a1c2e8 Implement -j for cvs diff, allowing tag:date based diffs (normally date-based
diffs are against the head branch only).

MFC after:	1 week
2001-09-15 05:50:59 +00:00
peter
cc58cb8636 Merge vendor branch onto mainline (try to fix HAVE_KERBEROS) 2001-08-20 08:47:21 +00:00
peter
92c0df1bed Fix the HAVE_KERBEROS case. It seems somebody got carried away
with cut/paste in the last release.

Submitted by:	Makoto MATSUSHITA <matusita@jp.FreeBSD.org>
Obtained from:	http://ccvs.cvshome.org/source/browse/ccvs/src/client.c.diff?r1=1.302&r2=1.303
2001-08-20 08:42:00 +00:00
peter
6696e00e0f Revert part of the 1.11->1.11.1p1 change. Put the blank line back in
the beginning of constructed log messages being passed to $EDITOR.  This
is where folks start typing.
2001-08-13 21:21:13 +00:00
peter
42325ad854 Argh, this could not possibly have worked as it existed in the tree. 2001-08-10 11:14:53 +00:00
peter
b52f372000 Copy our changes from sccs2rcs.csh to sccs2rcs.in 2001-08-10 11:14:18 +00:00
peter
f406110b8f Removed in cvs-1.11.1p1 import 2001-08-10 11:04:36 +00:00
peter
27d520da05 This commit was generated by cvs2svn to compensate for changes in r81440,
which included commits to RCS files with non-trunk default branches.
2001-08-10 11:04:36 +00:00
peter
849a12e500 Another stray file that got imported a long time ago and never cleaned up. 2001-08-10 11:02:03 +00:00
peter
8e62bd79e3 This commit was generated by cvs2svn to compensate for changes in r81437,
which included commits to RCS files with non-trunk default branches.
2001-08-10 11:02:03 +00:00
peter
4d6f4adb8c This file is gone in cvs-1.11.1p1 (replaced by log.in) 2001-08-10 11:00:14 +00:00
peter
3e5eeb8744 These files have been replaced by .in versions in cvs-1.11.1p1 2001-08-10 10:55:45 +00:00
peter
43f9c4ed31 This commit was generated by cvs2svn to compensate for changes in r81434,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:55:45 +00:00
peter
51dcafc969 Re-kill this file. It got whiplash being killed and restored on the
mainline, it is truely dead now.
2001-08-10 10:39:29 +00:00
peter
36dac7a113 Nuke some stray files that stopped getting imported ages ago. 2001-08-10 10:38:11 +00:00
peter
15024f87a2 This commit was generated by cvs2svn to compensate for changes in r81426,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:38:11 +00:00
peter
5dd04d4ff6 Remove some expired files no longer in current cvs 2001-08-10 10:33:41 +00:00
peter
55acc2cedc This commit was generated by cvs2svn to compensate for changes in r81424,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:33:41 +00:00
peter
c9c973b345 Generate version.c on the fly rather than using a generated file. 2001-08-10 10:29:04 +00:00
peter
81a09b283d This commit was generated by cvs2svn to compensate for changes in r81422,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:29:04 +00:00
peter
090346d906 Get the version source from the (more) correct place.
Remove the obsolete cvsbug.sh script
2001-08-10 10:22:43 +00:00
peter
3d7368c400 This commit was generated by cvs2svn to compensate for changes in r81420,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:22:43 +00:00
peter
756926d0a8 Remove another obsolete file, last used in cvs-1.10 2001-08-10 10:05:43 +00:00
peter
f44cc288f5 This commit was generated by cvs2svn to compensate for changes in r81414,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:05:43 +00:00
peter
016761c692 Remove file obsoleted in 1.11.1p1 import 2001-08-10 10:02:36 +00:00
peter
207e92ada7 This commit was generated by cvs2svn to compensate for changes in r81412,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:02:36 +00:00
peter
51bd4f3eee Tweak for 1.11.1p1 2001-08-10 09:53:53 +00:00
peter
75f7ac20d0 Initial merge of cvs-1.11 -> 1.11.1p1 changes onto mainline. There is
still some suspicious and/or broken stuff to fix yet.
2001-08-10 09:53:06 +00:00
peter
a037ef8f32 Import cvs-1.11.1p1 onto vendor branch 2001-08-10 09:43:22 +00:00
peter
c132709d18 This commit was generated by cvs2svn to compensate for changes in r81404,
which included commits to RCS files with non-trunk default branches.
2001-08-10 09:43:22 +00:00
peter
013c530653 Flip the default for CVS_RSH to "ssh". I am tired of getting asked this
all the time, and IMHO it is long overdue.
2001-02-23 04:52:30 +00:00
jdp
e6f3651c03 Fix a bug that shows up when checking out files by date with the
"-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
2000-10-29 03:56:49 +00:00
peter
a152a7ef82 Merge changes from 1.10.7 -> 1.11 into mainline. Note that the old
anoncvs no-password hack is gone and is replaced by the official version.
2000-10-02 06:43:58 +00:00
peter
590c411955 Import cvs-1.11 onto vendor branch. 2000-10-02 06:33:59 +00:00
peter
e0aa09eb34 This commit was generated by cvs2svn to compensate for changes in r66525,
which included commits to RCS files with non-trunk default branches.
2000-10-02 06:33:59 +00:00
peter
a9a721b706 Missing quote
PR:		misc/19745
Submitted by:	Tony Finch <dot@dotat.at>
2000-09-25 18:23:34 +00:00