Re: best production practice?
On Wed, Feb 09, 2005 at 03:52:29PM +, bobby temper wrote: Hello, What i meant is that, we have the code running on a production machine. Now and then, that code gets changed, and sometimes, it's content gets out of sync with whats on production (ie. for example. someone edit directly on production, for a hotfix (i know this is bad, but fast for changing a simple text, link, etc...) and forget to do the changes in cvs. I would cvs checkout to a staging server and then make a package to install on the production server, such as rpm or deb. That allows you to give your production releases version numbers. I've also used tagged cvs check outs to mark releases. And also just simply cvs for simple sites. But being structured with packaged releases is nice. I would like a way to know when the code on production isn't the same as the one in the source control (not to update production, but to update the repository). So far, the best way i thought of doing this was to have a cvs client on the production servers, and periodically (cron job) do a cvs -n update, logging the results. That's to check for changes on the production server? -- Bill Moseley [EMAIL PROTECTED] ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Testing for updated files
On Mon, Feb 07, 2005 at 11:18:26AM -0800, [EMAIL PROTECTED] wrote: grep for leading 'U' in cvs output. In the form of : U path/to/my.file Ah, that's easy. Thanks. cvs also writes this to stderr: cvs server: Updating . cvs server: Updating bin cvs server: Updating lib Can that be suppressed? I'd like my cron job to be quiet unless there's a problem and then mail me stderr output. I guess the solution is to capture stderr and then if cvs returns non-zero exit status cat that file and let cron mail it to me. Also, it may be better to add watches and watch actions to the cvs server. You could have the watch post changed file name to a log and have your crontab check that file for changes. This is cvs on SourceForge. Not sure how much I can modify there. But I'll take a look. Thanks for the help! -- Bill Moseley [EMAIL PROTECTED] ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
how to delete a branch
I created some branch for exercising. Now I have trouble to delete them. I tried : cvs rtag d B testbr moduleName and cvs admin o testbr but when I check the status of one of the file. The tags are still there. Do I have to setup something before running these commands? By the way, in Eclipse cvs client, is there a way to manage branches? Thanks a lot. Bill ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Newbie: update vs. checkout
In [EMAIL PROTECTED] Jim.Hyslop [EMAIL PROTECTED] writes: Irving Kimura wrote: I'm sorry for this very stupid question, but after spending a lot of time reading the CVS documentation, I still don't understand what *exactly* is the difference between update and checkout. Could someone explain it to me? There is a little bit of overlap in the functionality. You use checkout when you have nothing in your working directory yet, i.e. when you're doing a fresh checkout. You use update to refresh an existing checked-out project. If you use the checkout command in an existing working directory, then it will behave as if you issued the update command. Clear as mud? :-) Maybe an example will help: mkdir fresh cd fresh # at this point, there is no working directory cvs update # error - there's nothing to update cvs checkout mymodule cd mymodule [some time passes] cvs update # refresh the working copy cvs checkout # refresh the working copy Thanks! The fog is lifting. One question that remains has to do with update/checkout after tagging/rtagging. It is actually the exact same question about four different cases: cvs tagSome_Tag cvs tag -b Some_Branch_Tag cvs rtagSome_TagMyProject cvs rtag -b Some_Branch_Tag MyProject I've read that one has to call either checkout or update (I can't remember which) right after doing cvs tag? (Something about cvs tag not affecting the working copy, so that if one wants to work on a tagged copy one has to checkout/update.) To be more concrete: % cd MyProject % ls -F CVS CVS/ % cvs -q update no output: everything is up-to-date % cvs -Q tag Some_Tag At this point, do I need to cvs update or cvs checkout if I want to work on the copy I just tagged? What about exactly the same situation for branched tags, i.e. everything as before, except that the last command is: % cvs -Q tag -b Some_Branch_Tag ? The manual (4.6, p. 37) actually recommends using cvs rtag rather than cvs tag for most situations, because rtag will tag even those checked-in files for which no copy exists in the current working directory. Hence the interest in the rtag case: % cd MyProject % ls -F CVS CVS/ % cvs -q update no output: everything is up-to-date % cvs -Q rtag Some_Tag MyProject How about now? Assuming that I am interested in working only on those files for which copies already exist in the working directory, do I need to do cvs update or cvs checkout at this point? What about the branch tag case? % cvs -Q rtag -b Some_Branch_Tag MyProject Many, many thanks! Irv ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Non-build files under CVS control
I'm relatively new to CVS, so this may very well be an old FAQ, but I couldn't find an answer in the CVS FAQ at www.cvshome.org. I have many files that must be under revision control, but that are decidedly not part of our software's distribution. (Most of these files are Perl, Mathematica, and Matlab files that perform various support roles during development and testing.) These files coexist in the same directories with the source files that are part of the distribution. What is the best way to arrange things such that, at build time, I can check out only those files that are part of the distribution? Many thanks in advance for your suggestions, -bill P.S. A much simpler problem is several files that are part of the distribution, but should not be under CVS control. We deal with these via .cvsignore files. Just out of curiosity, is this the recommended approach in such situations? ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: What tags to delete when renaming files?
In [EMAIL PROTECTED] Jim.Hyslop [EMAIL PROTECTED] writes: snip Thank you very much, sir! That was very helpful. -bill ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Commit Problem
- Original Message - From: Mike Ayers [EMAIL PROTECTED] To: Bill Smith [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Sent: Thursday, December 05, 2002 3:51 PM Subject: Re: Commit Problem Please send only plain text messages to technical mailing lists. Thanks. New install. My mistake. I didn't realize it was still enabled. Thx. Bill Smith wrote: Below is a message I posted to the tortoise cvs mailing list. Additionally, I tried doing a cvs commit with cygwin cvs, I get /CVSROOTccess /var/cvs No such file or directory This is not a cut-and-paste of the output. Please send a cut-and-paste of the output, or reproduce the output faithfully. Approximate error messages do not help. Actually, yes it is a cut-and-paste, here it is again including the command line $ cvs commit cvs commit: Examining . [EMAIL PROTECTED]'s password: /CVSROOTccess /var/cvs No such file or directory Here s the entire trace with the -t option $ cvs -t commit cvs commit: notice: main loop with CVSROOT=:ext:[EMAIL PROTECTED]:/var/cvs cvs commit: Examining . - Starting server: ssh www.copperleaf.org -l bsmith cvs server [EMAIL PROTECTED]'s password: /CVSROOTccess /var/cvs No such file or directory FYI, the cygwin cvs version is $ cvs -v Concurrent Versions System (CVS) 1.11 (client/server) I know there is some inconsistency between the cvs cygwin cvs client and the cvsnt client but searching, it's not clear to me what those inconsistencies are. Can anyone clarify them? If you find this out, please tell us. :-) (Other than the line ending issue, that is). Hmmm. - I have a strange one here. I have a group of jpg images that I'm adding to a repository. When I do a cvs add, all the images add fine. When I try and commit, I get the error below for certain files. (I only see the message below if I commit them one at a time, when in a group, I get some generic message). What is weird is that in some cases, if I open the image in an editor and resave it (change jpg params) and try and commit, it will work. This could be a coincidence. What params are you changing? Opening a JPEG file in an editor and resaving it should change nothing. I played with changing the compression level of the jpg using the gimp. cvs SHOULDN'T care anyway. It's a Additional Info: TortoiseCVS version 1.2.1 client os: Windows XP Home server os: Redhat 7.2 server ssh version: OpenSSH_3.1p1 Server CVS version? server cvs version is 1.11.1p1 Client/server protocol? :ext: with ssh is implied, but you give an OpenSSH version, and TortoiseCVS only works with PLINK.EXE, which does not show an OpenSSH version. On the client side, TortoiseCVS is using plink which is connecting to sshd on the server side. This has worked successfully with all the other files. To add some more detail, it is only a handful of files (~12 out of 100) all jpgs that are acting up. The images all vary in size, but none exceed 30 - 40k. Any ideas? Honestly, I don't think this is a TortoiseCVS problem, but instead a generic cvs problem, but I was hoping someone on this list might have some ideas. I'm also gonna post this on the cvs list. *cough* Or generic pilot error? Just make sure you double check your setup. This may be true. (it's always a possibility :) However, what gives me pause is that it is just certain files. As mentioned above, other files in the same directory, created the same way, can be added and committed fine. I have a number of other modules (mix of file types including jpgs) that work fine. Since we are talking configuration, fyi, in the server cvswrappers file is an entry for jpgs: *.jpg -k 'b' In C:\Projects\webv3: C:\Program Files\TortoiseCVS\cvs.exe commit -m src/html/gallery/images/sunfun/009_6a.jpg CVSROOT=:ext:[EMAIL PROTECTED]:/var/cvs cvs commit: warning: unrecognized response `FATAL ERROR: Server sent disconnect message: ' from cvs server cvs commit: warning: unrecognized response `Corrupted check bytes on input. ' from cvs server cvs [commit aborted]: end of file from server (consult above messages if any) Check bytes? Smells like client/server incompatibility to me. /|/|ike ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Setting up Email Notification
Which OS is the server running?
My server is Windows 2000 professional. I use the cygwin tools for all my
scripting. http://www.cygwin.com/
They have an ssmtp client which I use for mail. I wrap it in the following
mail bash script:
#!/bin/bash
from=[EMAIL PROTECTED]
from=$USERNAME
subject=mail test
html=
test=
send_mail()
{
typeset line
printf To: $to_list\n
printf From: $from\n
printf Subject: $subject\n
if test $html !=
then
printf Content-type: text/html;\n\n
printf html\nbody\n\n
else
printf \n
fi
cat
if test $html !=
then
printf \n/body\n/html\n
fi
return
while read line
do
if test $line = .
then
return
else
printf $line\n
fi
done
}
#set -x
while test ${1:0:1} = -
do
case $1 in
-s )
subject=$2
shift
shift ;;
-f )
from=$2
shift
shift ;;
-html )
html=1
shift ;;
-test )
test=1
shift ;;
esac
done
if test $* =
then
echo usage: $0 [ -s subjectline ] [ -s sender ] [ -html ] [ -test ]
recipient [ recipient . . . ]
exit
fi
to_list=$*
if test $test !=
then
#send_mail | sed 's/\n/\r\n/g' | tee | /usr/sbin/ssmtp $to_list
send_mail | sed 's/\n/\r\n/g'
else
send_mail | sed 's/\n/\r\n/g' | /usr/sbin/ssmtp $to_list
fi
###
This script can be used
echo the include file changed | mail -s Include File Change Notice
[EMAIL PROTECTED]
I usually take the to-list from the contents of CVSROOT/writers.
ssmtp requires a config file /etc/ssmtp/ssmtp.conf to be set up to point to
your smtp server.
Bill
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of
Riechers, Matthew W
Sent: Monday, September 16, 2002 09:05
To: 'the_witchman'
Cc: [EMAIL PROTECTED]
Subject: RE: Setting up Email Notification
From: the_witchman [mailto:[EMAIL PROTECTED]]
Has anyone successfully set up email notification on a CVS server that
doesn't have a mail server?
You could probably send messages via command-line email client (assuming it
had access to a mail server).
-Matt
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Repairing repository
Whatever you do, make sure you use tags liberally. You should tag the whole repository before you start and after you are done. You should probably also add tags in stages as you are going along. It will pay off when you find you committed something that was not merged properly. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of Eric Siegerman Sent: Monday, July 29, 2002 15:38 To: [EMAIL PROTECTED] Subject: Re: Repairing repository On Mon, Jul 29, 2002 at 02:40:05PM -0400, Matt Riechers wrote: [EMAIL PROTECTED] wrote: I have copied the backup in to create a new repository. Now I must identify the files in the current working tree which are newer than (different from) the files in the repository, and get them comitted. Any suggestions for the easy way to do this? What's wrong with 'cvs update/commit'? Lots! The sandbox's state information doesn't correspond with the restored repo. I don't know what the results will be, but it could get ugly. Look in the archives of this list for my message of July 4, 2002, with the subject cvs repository confusion. That addresses a slightly different situation, but you should be able to adapt it to your needs. If you have further questions, feel free to ask. -- | | /\ |-_|/ Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / Anyone who swims with the current will reach the big music steamship; whoever swims against the current will perhaps reach the source. - Paul Schneider-Esleben ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvs vs. perforce
Anyone care to offer reasons, other than free, to use cvs over perforce? Or, the other way around? We are trying to make a decision. Thanks, /b ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Maximum connections to the server
I believe the standard NT workstation license limits you to 10 remote
connections. The server licenses support as many connections as you pay
for.
I have a w2000 professional system that I use as a server and it also has a
10 connection limit. This was a big pain as more and more people started
working in parallel. Whoever was number 11 got denied until one of the
connections timed out. The default timeout on windows is huge (hours?) so
you couldn't simply get a cup of coffee and try again. Efforts to change
the timeout by messing with the registry failed.
I ended up writing a script that uses some nt utilities to determine how
many connections there are and how long each has been connected but idle.
If it goes over a limit, I use another NT utility to kill the connection.
This has pretty much solved my problem for my team of about 20 developers.
I have not gotten the too many connections error or named pipe error in
months.
Here's the script if you are interested. It's been hacked several times, so
please forgive the style. Whenever I start the server I start this script
(it is an endless loop) in a window.
Bill
###
#!/bin/bash
typeset deleted_one=no
typeset -i max_session_time=10
typeset -i num_sessions=0
net session
get_num_sessions()
{
num_sessions=$(net session | wc -l)
let num_sessions=$num_sessions-6
if [ $num_sessions -le 0 ]
then
let num_sessions=0
fi
echo num_sessions=$num_sessions
if [ $num_sessions -ge 8 ]
then
let max_session_time=6
fi
}
proc_line()
{
typeset -i hours
typeset -i seconds
typeset -i t
typeset computer
let hours=1$1
let hours=$hours-100
let minutes=1$2
let minutes=$minutes-100
let t=$hours*60
let t=$t+$minutes
computer=$3
# echo proc_line( $* ) time=$t
if [ $t -ge $max_session_time ]
then
echo connection time $t for $computer, kill
net session $computer /delete /y
deleted_one=yes
else
echo connection time $t for $computer, ok
fi
}
proc_session()
{
typeset line
while read line
do
proc_line $line
done
}
kill_old_sessions()
{
net session
net session \
| cut -c0-20,69-73 \
| awk '/\\/''{print $2 $1}' \
| sed 's///'\
| sed 's/:/ /' \
| proc_session
}
###
top()
{
echo html
echometa http-equiv=Refresh content=30;
url=ServerSessions.html
echo title
echo Server Connections Status
echo /title
echo body
}
middle()
{
echo pre
date +Information gathered %D %T
net session
echo /pre
}
bot()
{
echo /body
echo /html
}
gen_html()
{
top
middle
bot
}
###
sleep_a_while()
{
typeset -i x
let x=$1
while [ $x -ge 1 ]
do
printf %3i\r $x
sleep 1
let x=$x-1
done
echo
}
###
#
# run at least one pass
# if an argument is passed, run continuously, once
# every five minutes
#
while true
do
tput home
tput clear
get_num_sessions
echo $num_sessions killsession.txt
date
kill_old_sessions
rm -f e:/tools/apache/apache/htdocs/ServerSessions.html
gen_html e:/tools/apache/apache/htdocs/ServerSessions.html
if [ $deleted_one = yes ]
then
deleted_one=no
net session
fi
echo
echo
echo sleeping before next search for connections
if [ $1 = ]
then
break
else
sleep_a_while 60
fi
done
echo goodbye
sleep 5
###
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of
Larry Jones
Sent: Tuesday, March 26, 2002 12:13 PM
To: jazzvale
Cc: [EMAIL PROTECTED]
Subject: Re: Maximum connections to the server
jazzvale writes:
please give me an answer
I thought I had, but apparently not.
I'm wondering about connection timeout and connection limit.
So, the questions are: does the connection have a timeout (how long is
it?) and is there a
limit of maximum connections to the server?
There is no timeout for an established connection (although CVS does use
TCP/IP KEEPALIVEs to try to detect broken idle connections). A CVS
server only supports a single connection -- [x]inetd is responsible for
starting a new server for each connection
RE: preventing direct repository changes
If you use one of the client/server versions of CVS you can do it. I use CVS NT with a dedicated Windows 2000 server. The CVS repository is on a disk drive which is only accessible from the server; it is not mountable remotely. I have the repository files writable by everyone, but nobody can get to them without using the CVS server or logging in at the server console (which carries a penalty of death). The only time you should have an issue is when users log into the same computer that is being used as the CVS server. Otherwise, as long as the volume with the repositories is not public nobody should be able to get in there and cause problems. David Everly writes: Is there some technique I can use to prevent my developers from directly altering the cvs repository and force them to use cvs commands instead? I find a big stick wielded with authority works pretty well. CVS isn't designed for anything more fascistic. -Larry Jones All girls should be shipped to Pluto--that's what I say. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Timestamping Tags?
cvs history -T will provide you a list of tags and their timestamps. If you need more information than this provides, you could call a script that captures the additional information from the CVSROOT/taginfo file. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of Claude Johnson Sent: Sunday, March 03, 2002 2:54 PM To: [EMAIL PROTECTED] Subject: Timestamping Tags? Is there some way to easily associate a tag with the creation time of that tag? Meaning, w/o making the creation time a part of the actual tag, is there some simple way to determine the creation time of the tag in CVS. I ask because what I would like to be able to do is to associate a tag (regular or branch) with the exact moment in time the tag was created. I'd prefer _not_ to actually incorporate the time into the tag, as has been suggested by others I have talekd to. And I realize that tags are all about corroborating the state of the code at an exact moment in time. But is there an easy way to reference this information, the time a specific tag was created? TIA! Claude Johnson Network Scientist Avamar Technologies 949.743.5145 Vox 949.743.5190 Fax www.avamar.com ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: WinCVS
I think it is stored in the registry. I took a quick look at my registry and found what looks like the file menu setting, but I couldn't figger out the magic. What I usually do when someone has your problem is to turn wincvs on, wait until it is done (which may take 10 or 20 minutes) and the switch off flat mode. Some times it takes forever to come back, but I have yet to see it never come back. Maybe you should go to lunch while you are waiting. Or go home for dinner . . . . I also greatly suggest that you never use the root as a working directory. Then if you accidentally press the button again, it won't take forever to come back again. Good luck Bill -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of Scott O. Sent: Thursday, February 07, 2002 11:15 AM To: [EMAIL PROTECTED] Subject: WinCVS Using WinCVS 1.2 on NT 4 Workstation. Need to find out where it is storing personal settings for it such as the default working folder etc. I have it set to flat mode and C:\ and it hangs on trying to expand all of the folders. Any ideas where these settings are stored? Thanks, Scott ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: slow splash screen
my guess is that you have flat mode selected under the view menu. In this mode WinCVS finds every file in your tree, sorts them and displays them in one screen. I have about 5000 files in my tree and it just took about five minutes to bring up WinCVS in this mode. With flat mode off the hierarchical display is drawn in a couple of seconds. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of Craig Williams Sent: Wednesday, February 06, 2002 12:23 PM To: '[EMAIL PROTECTED]' Subject: slow splash screen Does anyone know of a bug/problem/my screwup that hangs the initial winCVS splash screen for about 10 minutes before succesfully logging in? Others in my workgroup with the same configurations as mine don't have this problem. I'm running WinCvs 1.2 on a WIN98 machine CVS is installed on Solaris. Thanks for any and all help ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Partial checkout of an ampersand module
QUESTION: Is there a way to check out just one file from the tree below an ampersand module specifying the complete path? TOOLS: I am using a Win2k machine with CVSNT with: Concurrent Versions System (CVS) NT 1.11.1.2 Beta 3 (Build 33) (client/server) and NT clients with: Concurrent Versions System (CVS) 1.10.8 (client/server) MORE DETAIL: I have a line in my modules file that looks like: whole_thing part_one part_two We usually check out the whole thing with: cvs co -P -d whole_thing which produces whole_thing whole_thing/CVS whole_thing/part_one whole_thing/part_one/CVS whole_thing/part_one/the_rest_of_the_part_one_files_and_subdirectories whole_thing/part_two whole_thing/part_two/CVS whole_thing/part_two/the_rest_of_the_part_two_files_and_subdirectories This is what I expect. since the whole project is about 5,000 files, I don't want to check it all out when I don't have to. In certain instances, I want to check out a file under part_one first, and then check out the whole_thing. e.g.: cvs co whole_thing/part_one/subdir/my_file look at the file for a while with a script, and then: cvs update -C -P -d whole_thing to get the rest of the files in the project. The problem is that when I execute cvs co whole_thing/part_one/subdir/myfile get the following error message: cvs server: modules file missing directory for module whole_thing/part_one/subdir/myfile cvs.exe [checkout aborted]: cannot expand modules trying to check out whole_thing/part_one/subdir also fails If I first make a whole_thing directory, enter it, then check out part_one/subdir/myfile I get the desired file, but I do not get whole_thing/CVS, so when I execute the cvs update -C -P -d whole_thing later on I get: cvs server: nothing known about whole_thing The problem occurs when executing the commands either from a client PC or in a cygwin bash on the server. Thanks Bill ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Keyword Expansion and Merging Branches
We've run into spurious conflicts when merging branches. Files that have keywords (eg $Id$) in them lead to conflicts because the two files have different values for the keywords, and cvs can't recognize that the keywords are special. Looking in the cvs TODO, we found: 185. A frequent complaint is that keyword expansion causes conflicts when merging from one branch to another. . Reading the source revealed the following line in src/update.c, function join_file(): #if 0 if (*t_options == '\0') t_options = -kk; /* to ignore keyword expansions */ #endif our experiments had shown that the -kk option had made the conflicts go away, but led to the unfortunate side effect of having a sticky disabling of keyword expansion. Further, sophisticated options like this are not readily available from graphical clients such as WinCVS. Enabling the above code and recompiling solved the problem, and does not seem to leed to sticky keyword problems. My question: Why is this code disabled? What are the consequences of enabling it? Thanks. = Bill Reynolds(505)-292-3556 (Voice) (505)-265-8707 (FAX) Rhino Corps Ltd. Co. [EMAIL PROTECTED] Least Squares Software LLC [EMAIL PROTECTED] PO Box 91405 Albuquerque, NM 87199 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
toner cartridges
VORTEX SUPPLIES YOUR LASER PRINTER TONER CARTRIDGE, COPIER AND FAX CARTRIDGE CONNECTION SAVE UP TO 30% FROM RETAIL ORDER BY PHONE:1-888-288-9043 ORDER BY FAX: 1-888-977-1577 E-MAIL REMOVAL LINE: 1-888-248-4930 UNIVERSITY AND/OR SCHOOL PURCHASE ORDERS WELCOME. (NO CREDIT APPROVAL REQUIRED) ALL OTHER PURCHASE ORDER REQUESTS REQUIRE CREDIT APPROVAL. PAY BY CHECK (C.O.D), CREDIT CARD OR PURCHASE ORDER (NET 30 DAYS). IF YOUR ORDER IS BY CREDIT CARD PLEASE LEAVE YOUR CREDIT CARD # PLUS EXPIRATION DATE. IF YOUR ORDER IS BY PURCHASE ORDER LEAVE YOUR SHIPPING/BILLING ADDRESSES AND YOUR P.O. NUMBER NOTE: WE DO NOT CARRY 1) XEROX, BROTHER, PANASONIC, FUJITSU PRODUCTS 2) DESKJETJET/INK JET OR BUBBLE JET CARTRIDGES 3) ANY OFFBRANDS BESIDES THE ONES LISTED BELOW. OUR NEW , LASER PRINTER TONER CARTRIDGE, PRICES ARE AS FOLLOWS: (PLEASE ORDER BY PAGE NUMBER AND/OR ITEM NUMBER) HEWLETT PACKARD: (ON PAGE 2) ITEM #1 LASERJET SERIES 4L,4P (74A)$44 ITEM #2 LASERJET SERIES 1100 (92A)-$44 ITEM #3 LASERJET SERIES 2 (95A)$39 ITEM #4 LASERJET SERIES 2P (75A)---$54 ITEM #5 LASERJET SERIES 5P,6P,5MP, 6MP (3903A)-- -$44 ITEM #6 LASERJET SERIES 5SI, 8000 (09A)$95 ITEM #7 LASERJET SERIES 2100, 2200 (96A)---$74 ITEM #8 LASERJET SERIES 8100 (82X)-$115 ITEM #9 LASERJET SERIES 5L/6L (3906A)--$39 ITEM #10 LASERJET SERIES 4V-$95 ITEM #11 LASERJET SERIES 4000 (27X)--$79 ITEM #12 LASERJET SERIES 3SI/4SI (91A)---$54 ITEM #13 LASERJET SERIES 4, 4M, 5,5M-$49 ITEM #13A LASERJET SERIES 5000 (29X)-$125 ITEM #13B LASERJET SERIES 1200---$59 ITEM #13C LASERJET SERIES 4100---$99 ITEM #18 LASERJET SERIES 3100--$39 ITEM #19 LASERJET SERIES 4500 BLACK--$79 ITEM #20 LASERJET SERIES 4500 COLORS $125 HEWLETT PACKARD FAX (ON PAGE 2) ITEM #14 LASERFAX 500, 700 (FX1)--$49 ITEM #15 LASERFAX 5000,7000 (FX2)$64 ITEM #16 LASERFAX (FX3)--$59 ITEM #17 LASERFAX (FX4)--$54 LEXMARK/IBM (ON PAGE 3) OPTRA 4019, 4029 HIGH YIELD---$89 OPTRA R, 4039, 4049 HIGH YIELD---$105 OPTRA E310.312 HIGH YIELD$79 OPTRA E---$59 OPTRA N--$115 OPTRA S--$165 OPTRA T--$195 OPTRA E310/312---$79 OPTAA E410/412---$89 EPSON (ON PAGE 4) ACTION LASER 7000,7500,8000,9000--$105 ACTION LASER 1000,1500$105 CANON PRINTERS (ON PAGE 5) PLEASE CALL FOR MODELS AND UPDATED PRICES FOR CANON PRINTER CARTRIDGES PANASONIC (0N PAGE 7) NEC SERIES 2 MODELS 90 AND 95--$105 APPLE (0N PAGE 8) LASER WRITER PRO 600 or 16/600--$49 LASER WRITER SELECT 300,320,360-$74 LASER WRITER 300 AND 320$54 LASER WRITER NT, 2NT$54 LASER WRITER 12/640-$79 CANON FAX (ON PAGE 9) LASERCLASS 4000 (FX3)---$59 LASERCLASS 5000,6000,7000 (FX2)-$54 LASERFAX 5000,7000 (FX2)$54 LASERFAX 8500,9000 (FX4)$54 CANON COPIERS (PAGE 10) PC 3, 6RE, 7 AND 11 (A30)-$69 PC 300,320,700,720,760,900,910,920(E-40)--$89 90 DAY UNLIMITED WARRANTY INCLUDED ON ALL PRODUCTS. ALL TRADEMARKS AND BRAND NAMES LISTED ABOVE ARE PROPERTY OF THE RESPECTIVE HOLDERS AND USED FOR DESCRIPTIVE PURPOSES ONLY. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Getting an update on a particular branch on a particular day
Sorry to bother you all with this, but I have hunted up and down and can't figure this out. I want to update my tree to the state it was on a particular day on one of the branches, but I can't figure out how to do that. If I update to be on a particular day, then it automatically switches what I've checked out over to the trunk. If I specify both a date and a revision on the cvs update command line, I end up with the tip of the branch. What's the magic to look at yesterday's version of a branch? Thanks, Bill ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: enabling macros in wincvs1.2
check your path by right-clicking on My Computer/Properties/Advanced/Environment. I betcha the path to tcl is enclosed in quotes (e.g. c:/tools/tcl). Delete the quotes. Close and reopen wincvs (maybe needs reboot). It should work. I don't know why the tcl install throws the quotes in. Probably to protect against paths with white spaces. Or more likely it is expecting whatever it is passing the path change to to delete the quotes. I have been deleting quotes for weeks as I install wincvs on other peoples machines. Deleting the quotes works every time. -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of Douglas Campbell Sent: Wednesday, June 20, 2001 3:45 PM To: [EMAIL PROTECTED] Subject: enabling macros in wincvs1.2 I've installed wincvs1.2 and tcl 8.3.3 but tcl is not available! still. I'm running win2000 pro. cvs server is running as an nt service. tcl83.dll is in the system path. Any ideas? Thanks -Doug ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: F-ssh and cvs checkout - cannot start server via rsh
you're welcome. I was surprised when it didn't work for you the first time. I slap my forehead each time I forget to fix it when I set up a new client. That's the ONE thing I DO know how to fix now. bill -Original Message- From: Ning Zhu [mailto:[EMAIL PROTECTED]] Sent: Monday, June 11, 2001 11:33 AM To: [EMAIL PROTECTED] Subject: RE: F-ssh and cvs checkout - cannot start server via rsh Bill, Just want to let you know that your suggestion worked. I probably did something wrong last time. Removing the double quote did resolve the TCL problem. Again, thanks very much! N. -Original Message- From: Bill Biessman [mailto:[EMAIL PROTECTED]] Sent: Thursday, June 07, 2001 8:11 PM To: [EMAIL PROTECTED] Subject: RE: F-ssh and cvs checkout - cannot start server via rsh I found a problem with the tcl install: The windows path variable does not get set properly. If you go to right-click on My Computer, select Advanced, then Environment, you will see a bunch of variable definitions in the bottom of the box. Select the path variable (note that the exact procedure for getting to the path variable is slightly different for NT or 2000). Scroll left and right untill you see the path for tcl. In several of the installations I have run into the path was correctly added except for the fact that it was enclosed in double quotes. e.g. d:/tools/tcl/bin. I found if I deleted the double-quotes the tcl was found properly by wincvs. The only problem I imagine you would find would be caused if one of the directories in the path to tcl had a white space in it. This would segment the path variable. I think this is the reason the quotes were put in there in the first place. good luck bill -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of Ning Zhu Sent: Thursday, June 07, 2001 5:04 PM To: Subject: F-ssh and cvs checkout - cannot start server via rsh Hello, I have just downloaded WinCvs 1.2 and installed it on my Windows 2000 box. Whenever I start up WinCvs, I get TCL is *not* available, shell is disabled. It seems that TCL is needed in order for WinCvs micros to work. So I downloaded an ActiveTcl 8.3.3 package from the link that cvsgui.org points to and installed it on the same box (cvs client). It didn't resolve the problem. Also, I am using F-SSH to connect to our remote machine which forwards its connection to a real CVS server. I have my CVSROOT set to :pserver:[EMAIL PROTECTED]:/cvs/somedir. When I do a module checkout, it always says cvs [checkout aborted]: cannot start server via rsh: No such file or directory. What did I do wrong? Is the path I put for the module is incorrect or the ssh thing is not working at all -- I can login to that remote machine to do a command line cvs checkout. There is a /cvs/somedir/somefile on that remote machine and that's what I put for WinCvs as the module name and path. If you have any suggestions, I would very much appreciate it! Thanks in advance! N. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVSNT and multiple repositories
I am in the process of setting up CVS for our company. The primary purpose is for program source code control but we would like to also use it for design documents and other forms of electronic paper we have laying around. Hopefully groups other than the software development groups would take advantage it as well. I have an NT (actually, win 2000) server which is running ntserver and will hold the ,v files. We will use WinCVS at our workstations to access the files remotely. I would like to have the server support multiple repositories; e.g. one for each software project, additional ones for various forms of documentation. The purpose would be limit the number of modules visible to a user to ones that the user actually cares about. If I work on sw development, I don't care to see the harware bill of materials modules. I especially don't want to risk giving someone in the wrong department write access to files. Is it possible to have multiple repositories on one server? Do I tell a single ntserver instance about all of them, or do I create multiple ntserver instances with different CVSROOT values? I do not see an obvious way of doing this in the documentation, though I have seen some reference to changing from the default socket which I would think would provide some ability to distinguish between ntservers. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Connecting to a CVS-server on port *2402*
Torben, If you want to setup multiple pserver processes on a single host and access each one, then the patch to allow CVS_CLIENT_PORT will be necessary. If you only want to change the port used from the default, then change the port for cvspserver in /etc/services. The clients, and inetd will resolve the mapping from there. //Bill "Derek R. Price" wrote: Unfortunately, with versions of CVS 1.11 and earlier your only option is to patch, change the port pserver is assigned to in your /etc/services file or whatever it is under AIX that you have to do to get a different result from getservbyname, or compile a version of CVS after changing the value of CVS_AUTH_PORT in src/client.c. Unfortunately, except for the patch, you are still stuck with the same alternative port every time. There _is_ an even better fix if you feel like downloading the dev version of the source from the CVS repository. It allows you to specify an alternative port as part of CVSROOT. There's a small issue yet with the treatment of the password file, but it's no show stopper and I should have it fixed in another day or two. Of course, you'll still have to compile that. Derek -- Derek Price CVS Solutions Architect ( http://CVSHome.org ) mailto:[EMAIL PROTECTED] OpenAvenue ( http://OpenAvenue.com ) -- ... one of the main causes of the fall of the Roman Empire was that, lacking zero, they had no way to indicate successful termination of their C programs. - Robert Firth Christensen Torben Bach wrote: Thanks, Derek! But I still wonder if configuring-by-patching really is necessary? I quote from Karl Fogel's CVS-book: "Before running through the steps needed to set up the password server, let's examine how such connections work in the abstract. When a remote CVS client uses the :pserver: method to connect to a repository, the client is actually contacting a specific port number on the server machine - specifically, port number 2401 (which is 49 squared, if you like that sort of thing). Port 2401 is the designated default port for the CVS pserver, although one could arrange for a different port to be used as long as both client and server agree on it. " Sadly, KF doesn't reveal HOW to arrange it... /Torben -Original Message- From: Derek Scherger [mailto:[EMAIL PROTECTED]] Sent: 11. januar 2001 02:49 To: Torben B. Christensen Cc: [EMAIL PROTECTED] Subject: Re: Connecting to a CVS-server on port *2402* "Torben B. Christensen" wrote: Hi there! All the manuals seems to assume that port 2401 is always used for a pserver connection. Well, not on our AIX-box... So, how do I connect to an alternate port? I know from our WinCvs clients that it can be done, but how do I persuade the standard UNIX- client? My best guess would be changing the CVSROOT - just can't figure out how... /Torben B. Christensen ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs There's a patch floating around that allows you to export CVS_CLIENT_PORT=2402 before running the client that I've used with some success. I've attached the copy I've used which works against CVS 1.10.x. If I remember right this is from Derek Price at Open Ave. -- Cheers, Derek _ Derek Scherger Echologic Software Corporation mailto:[EMAIL PROTECTED] http://www.echologic.com ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS For VMS
Rex, I would like a copy of the source, or patches for VMS. //Bill [EMAIL PROTECTED] wrote: Nobody's contributed a binary for OpenVMS since 1.9.27, so if you need anything more recent you'll probably have to do some porting work yourself. That may or may not be a big deal. I can compile 1.11 (client only) under OpenVMS 7.2 if anyone is interested. We also have local modifications to support vms wildcard filespecs if interested. Those interested send me mail or post to list and if there is interest perhaps i can send the binary to someone at openave for hosting. I can try to compile the server side, but I havent yet done so. Rex. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: question about :local: access to repository on Windows box (USERNAME -- ?)
True, but if there are file permissions (there won't be for Win3.11, but will be for WinNT, if it's Win9x, then I think it's possible to circumvent any local file permissions), then the access to the CVS repository is based on the file permissions. //Bill Michael Peck wrote: I'm not exactly sure what you mean here. If the repos is :local:, then it's not possible to log in. Period. If you want to track who is using it, as you had in the subject, %USERNAME% works as long as the user actually logged in (problem for Win9x, because they don't require login). After that, you put correct permissions on the repository so that only allowed people have access. I guess that's the closest thing to a login when using :local:. If this isn't what you meant, then please explain again. Mike "X.X." wrote: Hello everybody. I'm sorry, but i have not found yet an answer to one important question: how one can log in with personal user_name to the `:local:' repository. It's so important, because we will keep the repository under Windows (not on UNIX box). If you have any idea or a "how to" link, write me, please. Thank you Best regards, Alexei Lyubimov PS: It seems, that in Cederqvist it is nothing about too :( ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
revision control
Hello Everyone; This is my first time posting. I have been watching the interaction for a while, but I did not see that anyone recently had the problem I am having now. Problem: An individual has updated a bunch of files in a certain directory. This person was not supposed to update the files. All the files this person updated are all bad. Question: What is the best way to revert all the files back to the previous individual versions that were good? Thanks Bill Shields [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: remote trunk/local branch?
That's the situation I'm in now and, as you note, it's OK. For one 3rd party tree, however, it's really not working. Hence the split repository idea. On Fri, 8 Sep 2000, Larry Jones wrote: [EMAIL PROTECTED] writes: With the proliferation of anonymous CVS repositories, I see the opportunity to stop importing 3rd party sources into a local repository. The question is how to handle my changes to the source, i.e. I'd like a split repository - the remote repository to have the trunk and the local repository to have the branch. Any one have a solution? I usually don't worry about a branch. My changes usually aren't big enough to be worth versioning, so I just keep them in my sandbox that's checked out from the public repository. -Larry Jones This sounds suspiciously like one of Dad's plots to build my character. -- Calvin
Re: Rollback?
On Thu, 31 Aug 2000, Tom Werges wrote: Date: Thu, 31 Aug 2000 21:33:09 -0700 From: Tom Werges [EMAIL PROTECTED] To: [EMAIL PROTECTED] Subject: Rollback? Resent-Date: Fri, 1 Sep 2000 02:05:53 -0400 Resent-From: [EMAIL PROTECTED] I need the ability to rollback a module to an earlier tag, and have that tag become the current revision. I was unable to find any way to do this in the faqs. The cvs reference manual lists a way to roll back, but the documentation is incorrect (it shows how to merge the current revision with previous ones, and says that this is rolling back). cvs co -r [tag] will not make that tag the current revision, and I can't commit to it; it is for historical purposes only. I grepped the mail archives for 'rollback' and found a hackish way to rollback for individual files only. However, I want to do so for a whole module, including un-deleteing the files that have since been deleted, and un-adding the files that have since been added. I tried exporting the tag to another directory, cvs removing all the files in the repository, copying all the files from the exported directory, adding the files from the exported directory, and committing. It works but it ain't pretty. There must be a simple way of doing this that I'm unaware of. Any help would be greatly appreciated. Thanks in advance, tom Tom, I've effectively done that by creating a branch at the tag point, then doing all new development in that branch. Of course, it was somewhat easy for me, because I've developed an entire environment (with wrappers around CVS) that understands branches. Bill
