RE: .trunk patch refinement

2000-06-20 Thread J. Cone
If they've migrated from sccs, this will have been done for them :-) At 05:01 PM 6/19/00 -0400, Greg A. Woods wrote: snip However people should *not* ever be doing such silly things -- there are more corner cases than just this one whre they can get into trouble! snip

Re: .trunk patch refinement

2000-06-20 Thread Eivind Eklund
On Mon, Jun 19, 2000 at 05:13:10PM -0500, David Thornley wrote: Mike Little referred to "some previous cvs admin", and this is precisely what happened in my case. Some previous CVS admin put some of the rev numbers to 2.x, and there's no way I can put them back to 1.x. You could probably do

WinCVS bug? Tcl script looking up locked files

2000-06-20 Thread Hans Schmid
Hi all, I am pretty new to WinCVS so please forgive me, if I have overlooked something obvious. I want to write a Tcl/Tk script to check, if files are locked by someone (puting out only one line per file) Is there a script around, that I can use ? WinCVS 1.1b14 comes with a SelectionTest.tcl

Re: .trunk patch refinement

2000-06-20 Thread John Macdonald
Russ Allbery wrote : || David Thornley [EMAIL PROTECTED] writes: || || Either way, any technique that assumes that all main trunk development || is on rev numbers 1.* is useless to me, and probably to quite a few || people. || || And it's quite possible to get into that state without any

Re: .trunk patch refinement

2000-06-20 Thread David Thornley
"Greg A. Woods" wrote: [ On Monday, June 19, 2000 at 17:13:10 (-0500), David Thornley wrote: ] Subject: Re: ".trunk" patch refinement Since it's a very natural thing to do, lots of people have done it. It's easy (and correct) to say they should not have done that, but the important

6-20-2000 .trunk patch refinement

2000-06-20 Thread Stephen Cameron
I have a new version of my ".trunk" patch (I sent it to bug-cvs already but I didn't want to pollute everyone's mailbox with a big patchfile twice, so I'm only sending this URL to info-cvs... Includes a new test case in sanity.sh for a revision "2.1" Changes to docs, comments...minor stuff.

.trunk patch, usage of -r1 random data point

2000-06-20 Thread Stephen Cameron
Just out of curiosity, I used my hacked version of cvs to do this on my biggest repository: cvs rdiff -s -r1 -r.trunk topmodule diffs.txt There were 459 (out of 6658) files that had a revision number that didn't start with "1", and quite a few that I was surprised to see. (that is, quit a

WinCVS setup.

2000-06-20 Thread Kent Yang
Howdy folks, I am setting WinCVS to connect to a Linux server where the CVS repository resides. I have setup the password authentication server and I seem to be able to login from WinCVS. However, I am getting an error in the status window. The error message is: TCL is *not* available,

Re: When is it appropriate to update a major version number?

2000-06-20 Thread Laird Nelson
Mike Jellison wrote: I don't understand why updating a major version number is a bad thing. Conceptually speaking, there are two identifiers for any file under configuration management: the identifier-that-the-version-control-system-assigns-to-it-to-keep-track-of-it-for-its-own-purposes and the

RE: WinCVS setup.

2000-06-20 Thread Anthony E. Glover
Kent, You will need to install TCL on your windows machine. I believe the link for this is: http://dev.scriptics.com/software/tcltk/downloadnow83.tml Tony -Original Message- From: Kent Yang [mailto:[EMAIL PROTECTED]] Sent: Tuesday, June 20, 2000 3:07 PM To: [EMAIL PROTECTED]

Merging from branch to mainline

2000-06-20 Thread Paul Adams
New to CVS -- Help! For a production bug fix: - After creating a branchtag via "cvs rtag -b -r prodtag branchtag module" then, modifying files/unit and system testing - How do I merge the modified files back into the mainline/trunk of the CVS source? Thanks in advance for your reply(ies).

How to get CVS user (not system user) in a notification script

2000-06-20 Thread Uwe Fritsch
Hi, we are using "log.pl" in the loginfo control file to send out notification to developers on new check ins. We are using the passwd access and have a public cvs account (cvsuser) for users which are remote. CVS itself stores the remote user's name (let's say henry) for the log message, but

Re: Repeatedly merging from branch to trunk

2000-06-20 Thread Brian Collins
Larry Jones wrote: Brian Collins writes: So, back to the branch, add another line (Line 3), commit it and merge it back to the trunk as above. This gives conflicts, thus: Line 1 f1 Line 2 on the trunk === Line 2 on the branch Line 3 1.1.2.2 when

[Q] multiple repository and patching changes

2000-06-20 Thread Eric / Chang-Cheng, Chao
Hi, is it possible for CVS to generate all the changes I have made to a module and save these changes as a patch file? I'm asking this because I have two repositories and I wish to have CVS generate all the changes I have made on the first repository since the last tag and save the information

Problem

2000-06-20 Thread Zieroth, Brian D.
Hello, I'm getting a problem (see below) whenver I try to a "get". I've checked the directories for '#cvs.wfl' or '#cvs.rfl' and can't see any. Has anyone seen this before? thanks! Brian Zieroth YellowGiant Corporation cvs server: failed to create lock directory in repository

Re: Repeatedly merging from branch to trunk

2000-06-20 Thread Eric Siegerman
On Wed, Jun 21, 2000 at 09:32:03AM +1000, Brian Collins wrote: OK, so, if on the branch the change had looked like this: Line 2 on the branch Line 2A and on the trunk it had looked like this: Line 2 on the trunk Line 2A then adding "Line 3" on the branch after "Line 2A" would

Re: Changing Revision with WinCVS!

2000-06-20 Thread Derek R. Price
Daniel Barsalou wrote: Can we reset the revision number of a file to 1.1? First off, I wouldn't do that if it were me. One of the major advantages of CVS, in my mind, is that you can go back to any old version of the file you like. And you always have that log and diff information if you

Re: Win32 DLL for remote control of CVS?

2000-06-20 Thread Derek R. Price
No, but you might try www.wincvs.org. Derek -- Derek Price CVS Solutions Architect mailto:[EMAIL PROTECTED] OpenAvenue ( http://OpenAvenue.com ) -- "If I was modest, I'd be perfect." -Ted Turner Jonah Goldshlag wrote: Hi, I'm not really sure if this is the

problems with winCVS (fwd)

2000-06-20 Thread Mark J. Miller
This won't apply to most of you, but just be warned. There's a bug in WinCVS 1.0.6 (possibly only on Win2000) which causes newly-added directories to be added in upper case, regardless of the actual name of the directory. However, this only occurs when you use the menu to add, not with the

Re: file permissions with client/server

2000-06-20 Thread Derek R. Price
You can play with the CVSUMASK environment variable. I'm not completely sure how it works. See the manual. Derek -- Derek Price CVS Solutions Architect mailto:[EMAIL PROTECTED] OpenAvenue ( http://OpenAvenue.com ) -- 151. H lp! S m b d st l ll th v w ls fr m m k yb

RE: .trunk patch refinement

2000-06-20 Thread Greg A. Woods
[ On Tuesday, June 20, 2000 at 10:41:16 (+0100), J. Cone wrote: ] Subject: RE: ".trunk" patch refinement If they've migrated from sccs, this will have been done for them :-) Yeah, no thanks to the broken use of sccs2rcs. Unfortunately nobody ever wrote an "sccs2cvs" that would properly