problem with co -d xx -n : bug or feature?

2001-02-02 Thread Haefelinger, Wolfgang
Hello there, here's my problem: defined an "ampersand module" in $CVSROOT/CVSROOT/modules and got a problem when checking out the module using checkout options "-d" and "-d" and want to know whether this is a (known) bug or a feature. That's what I have and what I did on $uname -a SunOS

RE: problem with co -d xx -n : bug or feature?

2001-02-02 Thread Chris Cameron
There used to be a patch available at cvshome to fix a similar problem in the modules file. I cannot remember the exact details, but we installed the patch. AFAIK it has not been incorporated into the main CVS tree. Sorry I can't give you any more details, but I'm out of the office, visiting

Easiest way to move a branch to the trunk

2001-02-02 Thread Brian J. Murrell
I have a project/repository which has a main branch (trunk) for stable, released versions and a development branch. The development branch was branched off of the main branch a while ago for development and has going along gangbusters. Now it is time to release. What is the easiest way to move

RE: problem with co -d xx -n : bug or feature?

2001-02-02 Thread Haefelinger, Wolfgang
Hello, 'down-nailed' my problem (see below) to next few lines in file ~/src/modules.c (around line 533). I included the #ifdef and #endif lines - and voila, cvs behaves as expected. #ifdef HAVE_MAJOR_HACK /* XXX - XXX - MAJOR HACK - DO NOT SHIP - this needs to be !pipeout, but

Re[2]: Concurrent VS...

2001-02-02 Thread James Lyon
NLY I think the problem any VC system is supposed to solve is to NLY prevent multiple people from editing the same file at the same NLY time. CVS does this. Instead, people edit different copies of the NLY same file at the same time. The first person to checkin succeeds. NLY CVS will prevent

Re[2]: Concurrent VS...

2001-02-02 Thread James Lyon
JD Maybe... maybe not. JD File locking is not the only solution to this problem. JD http://www.cvshome.org/docs/manual/cvs_10.html#SEC95 Thanks for the manual reference ... I've only dipped-into docs so far and had found nothing obvious before I got really heavily committed to the installation!

Re: Easiest way to move a branch to the trunk

2001-02-02 Thread Stephen Rasku
Brian Murrel wrote: I have a project/repository which has a main branch (trunk) for stable, released versions and a development branch. The development branch was branched off of the main branch a while ago for development and has going along gangbusters. Now it is time to release. What is

Re: Easiest way to move a branch to the trunk

2001-02-02 Thread Brian J. Murrell
On Fri, Feb 02, 2001 at 08:56:26AM -0800, Stephen Rasku wrote: Brian Murrel wrote: I know that this is shutting the barn door after the horses have gone but your new development should have been on the trunk and you should have had stable branch. Of course. It was a little more abstract

Re: Easiest way to move a branch to the trunk

2001-02-02 Thread Stephen Rasku
Brian Murrel wrote: But what to do about files that are on the head but not in the branch and vice versa? Figure out which ones are which and do some "cvs new" and "cvs delete"s? If you cvs update -p a file that only exists on the branch it will create it. If you do: cvs status

Re: Easiest way to move a branch to the trunk

2001-02-02 Thread Brian J. Murrell
On Fri, Feb 02, 2001 at 11:37:29AM -0800, Stephen Rasku wrote: Brian Murrel wrote: If you cvs update -p a file that only exists on the branch it will create it. If you do: cvs status new-file it will show: cvs server: use `cvs add' to create an entry for local.h

Re: Easiest way to move a branch to the trunk

2001-02-02 Thread Eric Siegerman
On Fri, Feb 02, 2001 at 05:07:31AM -0800, Brian J. Murrell wrote: I have a project/repository which has a main branch (trunk) for stable, released versions and a development branch. The development branch was branched off of the main branch a while ago for development and has going along

Re: Easiest way to move a branch to the trunk

2001-02-02 Thread Richard Cobbe
Lo, on Friday, February 2, Brian J. Murrell did write: I have a project/repository which has a main branch (trunk) for stable, released versions and a development branch. The development branch was branched off of the main branch a while ago for development and has going along gangbusters.

Re: Too Frequently Asked Question of info-cvs mailing list

2001-02-02 Thread Alexey Mahotkin
I'm answering to both of you :) "LS" == Laine Stump [EMAIL PROTECTED] writes: LS I've taken Jerry Nairn's vss2cvs.pl script, which you have on your LS website, and enhanced it quite a bit. It is now available at LShttp://www.laine.org/cvs/vss2cvs "CH" == Curt Hagenlocher [EMAIL

pserver passwd

2001-02-02 Thread arul_venki
Hi How to connect to a remote system and setting of password for CVS .when i connect a remote system i want the information that how to set the cvspassword in server side while i accessin the repository from client. i have an message while connetion with the server failure aborted with the

Re: pserver passwd

2001-02-02 Thread Larry Jones
[EMAIL PROTECTED] writes: cvs [login aborted]: recv() from server lor.kovaiteam.com: Connection reset by peer There's something wrong with your server. If it's running CVS 1.10.6, pserver is broken and you must update: you can get the current version (1.11) from www.cvshome.org.