Re: Renaming a branch

2005-05-04 Thread Larry Jones
David Leskovac writes:
> 
> Okay. So, just to be clear, this is actually a 3-step process:
> 1. Checkout branch:
>cvs co -r  
> 2. Rename from sandbox:
>cd to root of module in sandbox
>cvs admin -n newname:oldname
> 3. Delete original tag name sandbox:
>cd to root of module in sandbox
>cvs tag -d oldname
> 
> Correct?

Correct.  I strongly encourage you to verify that step 2 has worked
correctly before you move on to step 3, though.  :-)

-Larry Jones

There's a connection here, I just know it. -- Calvin


___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: Renaming a branch

2005-05-04 Thread Jim Hyslop
David Leskovac wrote:
Sorry for the basic question but I need to implement a new branch
naming scheme & want to make sure I am doing this correctly.
To start this process, I need to rename several existing branches.
Would this work for each branch to be renamed?:
cvs rtag -b -r   
cvs rtag -d 
I am aware of the -B argument to rtag. But, the version of cvs that
we use is so old (1.11.1p1) that it pre-dates that argument.
That will probably get you where you want to be, although it doesn't 
really do what your stated goal is (to rename the branch). It will 
create a new branch and delete the old branch. The effect will be the 
same, but be aware that you will be branching off a branch. Suppose, for 
example, that the tip revision for a particular file on 
original_branch_name is 1.2.2.2:

Before branch add and delete:
1.1 --- 1.2 --- ...
 \
  + --- 1.2.2.1 --- 1.2.2.2
after branch add and delete:
1.1---1.2--- ...
   \
+---1.2.2.1---1.2.2.2---X <--old branch (effectively dead)
  \
   + ---1.2.2.2.2.1 <-- new branch
'cvs co -r new_branch_name' will retrieve the correct branch.
--
Jim

___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: Renaming a branch

2005-05-04 Thread Larry Jones
David Leskovac writes:
> 
> Okay. So rather than the 2-step process I mentioned in my original post
> where I would create a new branch from the original branch & then delete
> the original branch, there is a way to simply rename the existing branch
> with a "cvs admin -n" command? I looked at the syntax of "cvs admin" but
> it is not clear to me how this can be achieved. Would someone please provide
> an example?

You still need a 2-step process, you just use admin -n to create a new
name for the existing branch rather than using tag -b to create a new
branch:

cvs admin -n newname:oldname
cvs tag -d oldname

(Note that there's no "radmin" command so you need to have a checked out
working directory.)

-Larry Jones

Hmm... That might not be politic. -- Calvin


___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


RE: Renaming a branch

2005-05-04 Thread David Leskovac

>> Would this work for each branch to be renamed?:
>> cvs rtag -b -r   
>
> No, that creates a new branch off of the existing branch rather than
> renaming the existing branch.  You need to use admin -n instead.

Okay. So rather than the 2-step process I mentioned in my original post
where I would create a new branch from the original branch & then delete
the original branch, there is a way to simply rename the existing branch
with a "cvs admin -n" command? I looked at the syntax of "cvs admin" but
it is not clear to me how this can be achieved. Would someone please provide
an example?

Thanks,
-Dave


___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


RE: Renaming a branch

2005-05-04 Thread David Leskovac

> You still need a 2-step process, you just use admin -n to create a new
> name for the existing branch rather than using tag -b to create a new
> branch:
>
>   cvs admin -n newname:oldname
>   cvs tag -d oldname
>
> (Note that there's no "radmin" command so you need to have a checked out
> working directory.)

Okay. So, just to be clear, this is actually a 3-step process:
1. Checkout branch:
   cvs co -r  
2. Rename from sandbox:
   cd to root of module in sandbox
   cvs admin -n newname:oldname
3. Delete original tag name sandbox:
   cd to root of module in sandbox
   cvs tag -d oldname

Correct?

-Dave


___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: rcsinfo

2005-05-04 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi Michael,

You may need to see if CVS/Template is getting
properly setup. I believe that a cvs 1.11.x server
does not update that file via a 'cvs update' while
a cvs 1.12.x server does update it.

If you checkout a new tree, you should see the new
template being used.

Be advised that specifying /tmp for a critical file
is probably not wise. You may wish to put that file
into the CVSROOT directory itself.

Good luck,
-- Mark
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFCeTvf3x41pRYZE/gRAmR1AKCbFXP2OoJ6xCLglIPElVlrkzvWHQCgtnb0
IzHJhR1MyWIIeuo4IP7cAwk=
=YB2D
-END PGP SIGNATURE-


___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


(no subject)

2005-05-04 Thread Mark Baushke
: "Arthur Barrett" <[EMAIL PROTECTED]>
cc: "Conrad T. Pino" <[EMAIL PROTECTED]>, "HSP" <[EMAIL PROTECTED]>,
info-cvs@gnu.org
Subject: Re: Question about binary distribution 
In-Reply-To: <[EMAIL PROTECTED]> 
References: <[EMAIL PROTECTED]>
From: "Mark D. Baushke" <[EMAIL PROTECTED]>
X-Mailer: MH-E 7.82+cvs; nmh 1.0.4; GNU Emacs 21.3.1
X-Face: #8D_6URD2G%vC.hzU
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
Date: Wed, 04 May 2005 14:14:36 -0700
Message-ID: <[EMAIL PROTECTED]>
Sender: [EMAIL PROTECTED]

=2DBEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Arthur Barrett <[EMAIL PROTECTED]> writes:

> >>>hello, i downloaded cvs-1-11-20.zip from https://ccvs.cvshome.org but=
=20
> >>>i can=B4t find information about wich windows versions are supported.=
=20
> >>>Is Windows 2003 server suitable for cvs server ?
> >>
> >>You may also need cygwin and other tools to run this version of CVS on=
=20
> >>Windows Server 2003.
> >
> >The Windows CVS client binary distributed by the CVS Project is=20
> >compiled using Microsoft Visual Studio 6.0 and does NOT require=20
> >"Cygwin" or any other software.  The compiled EXE is statically=20
> >linked, requires no DLL libraries and runs alone as is.
>=20
> Yes you are right - my mistake.
>=20
> I was thinking of the SSH support. Am I right in assuming that cvshome
> cvs requires cygwin for ssh support on windows?=20

You should be able to use Putty by setting up your CVS_RSH environment
variable without needing cygwin. Of course, you would need to download
Putty and maybe Pagent as well, but neither of them require cygwin.

> I also think I saw a post recently somewhere saying that cygwin ssh is
> not windows 2003 compatible...

That is something to address with the cygwin and/or OpenSSH folks as it
is outside the scope of CVS dependencies.

Enjoy!
-- Mark
=2DBEGIN PGP SIGNATURE-
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFCeTs83x41pRYZE/gRAg4vAJ0cr1HgwYNgeqITtvXCj176zJWCngCgsqGi
OoJquOg+RD2FfxouGuSfNhk=3D
=3D7p4O
=2DEND PGP SIGNATURE-


___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: Question about binary distribution

2005-05-04 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1


Arthur Barrett <[EMAIL PROTECTED]> writes:

> >>>hello, i downloaded cvs-1-11-20.zip from https://ccvs.cvshome.org but
> >>>i can=B4t find information about wich windows versions are supported.
> >>>Is Windows 2003 server suitable for cvs server ?
> >>
> >>You may also need cygwin and other tools to run this version of CVS on
> >>Windows Server 2003.
> >
> >The Windows CVS client binary distributed by the CVS Project is
> >compiled using Microsoft Visual Studio 6.0 and does NOT require
> >"Cygwin" or any other software.  The compiled EXE is statically
> >linked, requires no DLL libraries and runs alone as is.
>
> Yes you are right - my mistake.
>
> I was thinking of the SSH support. Am I right in assuming that cvshome
> cvs requires cygwin for ssh support on windows?

You should be able to use Putty by setting up your CVS_RSH environment
variable without needing cygwin. Of course, you would need to download
Putty and maybe Pagent as well, but neither of them require cygwin.

> I also think I saw a post recently somewhere saying that cygwin ssh is
> not windows 2003 compatible...

That is something to address with the cygwin and/or OpenSSH folks as it
is outside the scope of CVS dependencies.

Enjoy!
-- Mark
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFCeTyt3x41pRYZE/gRAmqzAJ9Pmh1nY1u3hRQ7sVkQERT+zZNvfwCeJtPB
CoMpi1tQXL3DCIzvk587W7w=
=DZ1B
-END PGP SIGNATURE-


___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: Renaming a branch

2005-05-04 Thread Larry Jones
David Leskovac writes:
> 
> Would this work for each branch to be renamed?:
> cvs rtag -b -r   

No, that creates a new branch off of the existing branch rather than
renaming the existing branch.  You need to use admin -n instead.

-Larry Jones

Kicking dust is the only part of this game we really like. -- Calvin


___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


RE: Question about binary distribution

2005-05-04 Thread dzielke

Sorry if this has been answered already...

If you want to run it on Windows you'll need to go to http://www.cvsnt.org and download the Windows binaries for CVSNT.

Thanks,
Don Zielke
American Electric Power
Direct (614) 583-6337
Audinet 8-220-6337
Email dzielke (at) aep.com
---
KForce Professional Staffing
501 W. Schrock Road Suite 207
Westerville, OH 43081






"Conrad T. Pino" <[EMAIL PROTECTED]>
Sent by: [EMAIL PROTECTED]
05/03/2005 02:14 AM

        
        To:        "HSP" <[EMAIL PROTECTED]>, 
        cc:        
        Subject:        RE: Question about binary distribution


The ZIP file you downloaded contains a CVS "client" suitable
for running against the Win32 API (Windows 9x, Me, NT, 2000,
XP, 2003).  The CVS Project does NOT support "server" mode
on any Windows version.

Other projects do implement CVS compatible servers on Windows
but since I don't know any of them well I'm reluctant to make
a recommendation and leave that to others.

> -Original Message-
> From: [EMAIL PROTECTED]
> [mailto:[EMAIL PROTECTED] Behalf Of HSP
> Sent: Monday, May 02, 2005 13:09
> To: info-cvs@gnu.org
> Subject: Question about binary distribution
>
> hello, i downloaded cvs-1-11-20.zip from https://ccvs.cvshome.org but
> i can´t find information about wich windows versions are supported. Is
> Windows 2003 server suitable for cvs server ?
>
> thanks in advance!!
> ___
> Info-cvs mailing list
> Info-cvs@gnu.org
> http://lists.gnu.org/mailman/listinfo/info-cvs



___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: rcsinfo

2005-05-04 Thread Michael Starkie
The reason this was not working is because the template is stored
locally uder the CVS directory so it only applies to new modules that
are checked out.  After implementing rcs info you must check everything
out again.

___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


contrib directory?

2005-05-04 Thread dzielke

This is like the third reference I've seen to a "contrib" directory... where is it?  

Thanks,
Don Zielke
American Electric Power
Direct (614) 583-6337
Audinet 8-220-6337
Email dzielke (at) aep.com
---
KForce Professional Staffing
501 W. Schrock Road Suite 207
Westerville, OH 43081






Jim Hyslop <[EMAIL PROTECTED]>
Sent by: [EMAIL PROTECTED]
05/02/2005 08:09 PM

        
        To:        Dean Do <[EMAIL PROTECTED]>
        cc:        info-cvs@gnu.org
        Subject:        Re: Lock on Trunk


Dean Do wrote:
> Hi,
> 
> I have a question on access control.  Is there a way to prevent all commits
> on the main trunk and allow commits on branches only?  Once the changes on
> the branch are reviewed and approved for merging into the main trunk, then
> the main trunk can be manually opened up temporarily for those changes only.
> 
> Please advise if there's a way to implement this type of controlled access.

Yes. Have a look at the cvs_acls script, in the contrib/ directory of 
the source distribution.

-- 
Jim



___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


rcsinfo

2005-05-04 Thread Michael Starkie
Hello,
I have checked in the rcsinfo file below to CVSROOT but i don't see the
contents of the included template show in the editor when I do a
commit. The template contains one line, a bug id.

bugId:


- rcsinfo --

cvs version: 1.11.18 on redhat

# The "rcsinfo" file is used to control templates with which the editor
# is invoked on commit and import.
#
# The first entry on a line is a regular expression which is tested
# against the directory that the change is being made to, relative to
the
# $CVSROOT.  For the first match that is found, then the remainder of
the
# line is the name of the file that contains the template.
#
# If the repository name does not match any of the regular expressions
in thi
# file, the "DEFAULT" line is used, if it is specified.
#
# If the name "ALL" appears as a regular expression it is always used
# in addition to the first matching regex or "DEFAULT".
# ALL $CVSROOT/CVSROOT/bugz.txt
ALL /tmp/bugz.template

___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


RE: Question about binary distribution

2005-05-04 Thread Arthur Barrett
Conrad,

>>
>>>hello, i downloaded cvs-1-11-20.zip from https://ccvs.cvshome.org but 
>>>i can´t find information about wich windows versions are supported. 
>>>Is Windows 2003 server suitable for cvs server ?
>>
>>You may also need cygwin and other tools to run this version of CVS on 
>>Windows Server 2003.
>
>The Windows CVS client binary distributed by the CVS Project is 
>compiled using Microsoft Visual Studio 6.0 and does NOT require 
>"Cygwin" or any other software.  The compiled EXE is statically 
>linked, requires no DLL libraries and runs alone as is.

Yes you are right - my mistake.

I was thinking of the SSH support.  Am I right in assuming that cvshome cvs 
requires cygwin for ssh support on windows?  I also think I saw a post recently 
somewhere saying that cygwin ssh is not windows 2003 compatible...

Regards,


Arthur




___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


Renaming a branch

2005-05-04 Thread David Leskovac
Hi,

Sorry for the basic question but I need to implement a new branch
naming scheme & want to make sure I am doing this correctly.

To start this process, I need to rename several existing branches.

Would this work for each branch to be renamed?:
cvs rtag -b -r   
cvs rtag -d 

I am aware of the -B argument to rtag. But, the version of cvs that
we use is so old (1.11.1p1) that it pre-dates that argument.

-Dave


___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


RE: Question about binary distribution

2005-05-04 Thread Conrad T. Pino
> From: Arthur Barrett
>
> >hello, i downloaded cvs-1-11-20.zip from https://ccvs.cvshome.org but
> >i can´t find information about wich windows versions are supported. Is
> >Windows 2003 server suitable for cvs server ?
>
> You may also need cygwin and other tools to run this version of CVS on 
> Windows Server 2003.

The Windows CVS client binary distributed by the CVS Project is compiled
using Microsoft Visual Studio 6.0 and does NOT require "Cygwin" or any
other software.  The compiled EXE is statically linked, requires no DLL
libraries and runs alone as is.



___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs


Re: contrib directory?

2005-05-04 Thread Jim Hyslop
[EMAIL PROTECTED] wrote:
This is like the third reference I've seen to a "contrib" directory... 
where is it?  
As I said, it's in the source code distribution. Download the source 
code from www.cvshome.org.

--
Jim

___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs