Commit Graph

132 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
a037ef8f32 Import cvs-1.11.1p1 onto vendor branch 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
kris
3b6a5fa38a Use X x X's in mkstemp(). 2000-01-10 08:56:01 +00:00
peter
d8b8a4a2a7 I believe this fixes the problem certain people have been seeing when doing
checkouts from a local repo and committing via remote cvs.  A cvs -d
override of the mismatched CVS/Root files was missing.  This is a client
side fix, I'd appreciate it if the folks having trouble with this would
update their cvs client and pay particular attention next time..
2000-01-06 17:57:24 +00:00
peter
f76c207acb Unmangle cvs's MD5* calls. 1999-12-11 15:10:02 +00:00
peter
17ef7b81d6 Take a shot at using mkstemp() since we have a __warn_references() on
the other temporary file creation functions..
1999-12-11 14:58:02 +00:00
peter
702fe2212d Merge error. rcs_lockfile is freed after unlock. 1999-12-11 13:19:17 +00:00
peter
d47f395242 Update for 1.10.7 update. 1999-12-11 13:11:47 +00:00
peter
aab6aeadd4 Merge cyclic changes from 1.10.7 into our mainline. I did this seperately
as cvs update -j had kittens over the whole thing and I ended up merging
it by hand.
1999-12-11 13:00:18 +00:00
peter
206fbe27a1 Merge cyclic changes for 1.10.7 only our mainline. 1999-12-11 12:50:10 +00:00
peter
474a3106d4 Revert to vendor version. Sigh, this left the vendor branch because
of a fix for a y2k non-problem. :-(
1999-12-11 12:42:49 +00:00
peter
784ea5066c Import cvs-1.10.7. There are a number of nasty bugs that have been fixed.
Obtained from:  cyclic.com
1999-12-11 12:24:21 +00:00
peter
b38569ff99 This commit was generated by cvs2svn to compensate for changes in r54427,
which included commits to RCS files with non-trunk default branches.
1999-12-11 12:24:21 +00:00
peter
e739339ea1 Add maintainer tag, and add a description of a few more things we've
added/changed locally for FreeBSD.
1999-12-08 16:49:38 +00:00
obrien
4dbe46020b Call isspace() directly to get rid of an objectionable include. 1999-12-04 08:44:05 +00:00
peter
370aed25b5 Document the .cvsrc "cvs" option for global options. 1999-12-04 02:15:30 +00:00
obrien
63450d9255 Support the environtmental var "CVS_OPTIONS". Which can hold a set of
default options for cvs.  These options are interpreted first and can be
overwritten by explicit command line parameters.

Obtained from:	GNU Grep 2.3
1999-12-04 01:23:26 +00:00
peter
6976901e20 If running on the client side of a remote commit, don't reject root when
trying to do a commit.  The server side will use the correct name, and the
client side restriction is just an annoyance.

Requested by:  lots of folks
1999-10-25 06:24:11 +00:00
obrien
587e83e810 Document -R. 1999-09-11 13:33:18 +00:00
bde
5e316e4dee Fixed style bugs in FreeBSD changes. KNF style doesn't apply to gnu
sources.
1999-07-04 15:46:44 +00:00
peter
61eefd2271 Don't assume branch heads are alive.. (related to previous change to the
older 1.9.26 baseline)
1999-05-10 13:49:51 +00:00
peter
a87f5a3076 Zap files not in cvs-1.10 1999-04-05 06:36:11 +00:00