Re: Tkdiff

2002-06-05 Thread Paul Sander
Last September I posted a patch that allows for the integration of new merge tools based on file extension. It's alpha-quality code, but a good demonstration that, despite what certain individuals have claimed, the CVS design is robust enough to accommodate an extensible merge mechanism. I b

Tracking third party software

2002-06-05 Thread Ripalda-Marin, Miguel-Angel
When I started one project and setup my CVS, I included in my repository the sources for GNU tar... I used the VENDOR (GNU) and VERSION (v1_13) tags when importing the modules... and get on modifying those sources within the main trunk... Now I would like to add to that branch the changes include

removing branch completely from repository?

2002-06-05 Thread Robert Lange
Hello! Is there any possibility to remove a branch completely from the repository? For example, if I branched off one version for testing a problem, which turns out to be of no use and I am absolutely sure I won't need this branch again. TIA! -- Cu, Robert __

Re: using cvs on a multi-developer web project ,help?

2002-06-05 Thread Noel Yap
--- Paul Tomsic <[EMAIL PROTECTED]> wrote: > what's the ideal way to deploy CVS in a > web-development context using Apache/Tomcat. I've already given my opinion on this so I won't elaborate more on it. > How would a web-based implementation of CVS be > different than a software build type CVS >

RE: synchronizing multiple CVS-repositories .... ?

2002-06-05 Thread Schmidt Henning (BNS USA)
Title: RE: synchronizing multiple CVS-repositories ? As far as I understand CVSUP lets me get a copy of the whole source tree from a remote server. This will give me one version of every element (file). correct? What I want is to be able to synchronize the complete repository betwee

RE: Commit Error

2002-06-05 Thread Vijay Narayanan
Hi, Thanks for the mail. My problem was that I had to have the same file name even the case mattered. I solved it by removing the ,v entriesfor the files in the Attic as well as the repository directory and re-added the file back again. Thanks Vijay -Original Message- From: Peter Kesch

Re: using cvs on a multi-developer web project ,help?

2002-06-05 Thread Paul Tomsic
Thanks again, Noel. Appreciate your thoughts. This is my first role as a cvs-type admin, so I'm slowly munging through just about every piece of documentation that I can get a hold of. Cheers, Paul --- Noel Yap <[EMAIL PROTECTED]> wrote: > --- Paul Tomsic <[EMAIL PROTECTED]> wrote: > > what's

Re: Tracking third party software

2002-06-05 Thread Larry Jones
Ripalda-Marin, Miguel-Angel writes: > > When I started one project and setup my CVS, I included in my repository the > sources for GNU tar... I used the VENDOR (GNU) and VERSION (v1_13) tags when > importing the modules... and get on modifying those sources within the main > trunk... > > Now I w

Re: Tracking third party software

2002-06-05 Thread Greg A. Woods
[ On Wednesday, June 5, 2002 at 11:54:07 (+0100), Ripalda-Marin, Miguel-Angel wrote: ] > Subject: Tracking third party software > > Now I would like to add to that branch the changes included in a patch file > developed by GNU... I would like to know is the things I have to do are > these: > > 1.

How do I make the cvsignore file recursive

2002-06-05 Thread Stockfisch, Glenn
I've had success making a cvsignore file work in a specific directory, by placing the file in that directory, but I'm pretty sure that you should be able to make an ignore file work globally (i.e. block out all .bak files no matter how far down the tree structure). I've tried the help files sugges

RE: synchronizing multiple CVS-repositories .... ?

2002-06-05 Thread Greg A. Woods
[ On Wednesday, June 5, 2002 at 07:07:00 (-0500), Schmidt Henning (BNS USA) wrote: ] > Subject: RE: synchronizing multiple CVS-repositories ? > > As far as I understand CVSUP lets me get a copy of the whole source tree > from a remote server. This will give me one version of every element (fi

Re: using cvs on a multi-developer web project ,help?

2002-06-05 Thread Noel Yap
--- Paul Tomsic <[EMAIL PROTECTED]> wrote: > Thanks again, Noel. > > Appreciate your thoughts. > > This is my first role as a cvs-type admin, so I'm > slowly munging through just about every piece of > documentation that I can get a hold of. No problem. I think it's important to remind oneself

How to only checkout files (not being able to commit)?

2002-06-05 Thread Tommy Svensson
Hi all, I have a CVS folder which I don't want to be checkoutable (this has been achieved simply by chmod the appropriate rights). However, it has a subfolder which I do want people to be able to checkout/update from BUT not being able to commit to. Is this possible to do? I've tried using LockD

Re: Tracking third party software

2002-06-05 Thread Greg A. Woods
[ On Wednesday, June 5, 2002 at 10:37:57 (-0400), Larry Jones wrote: ] > Subject: Re: Tracking third party software > > 1. EXPORT the original sources (cvs export -rv1_13) If you do that then it's critical to use "-ko", at least when managing sources that include RCS keywords There's also a pot

RE: Tracking third party software

2002-06-05 Thread Ripalda-Marin, Miguel-Angel
[ On Wednesday, June 5, 2002 at 10:37:57 (-0400), Larry Jones wrote: ] > Subject: Re: Tracking third party software > > 1. EXPORT the original sources (cvs export -rv1_13) Hi, What's the difference between checking-out the 'avendor' branch (with the 'arelease' tag) and then patching... and expo

Changing the type of files from text to binary

2002-06-05 Thread Reinstein, Shlomo
Hi, I work with CVS 1.11. I would like to change the type of .dsp and .dsw files (Project files and Workspaces of MSDEV) in my repository to binary, so that they can be used with MSDEV even when checked-out on Linux. The problem with that is that changing the type to binary (using "cvs admin -kb

Corrupted repository (check_cvs.pl)

2002-06-05 Thread Miller Sally S NPRI
Using CVS 1.10 on Solaris The team had been using RCS for a long time and did not see any problems. Still I was concerned about our set-up as I am not sure if it is correctly NFS or not. The other day I got: "cvs [update aborted]: invalid change text in /home/cvsroot/src/foo,v" I searched the ar

multiple developers sharing one working directory

2002-06-05 Thread Judy Pearson
Unix cvs server (cvs 1.11.1p1) with the pserver access method Unix (cvs 1.11.1p1) and WinCVS 1.2 clients. Our shop is in the process of moving from VSS to cvs (yay!). I have a set of Java/jsp programmers who share development in one working directory. (They will not be convinced that sharing a

Revert imported & modified files to "pristine" status

2002-06-05 Thread Kenn Humborg
I've got an imported vendor branch, that I regularly update with new vendor releases. Most files in the vendor's sources are unmodified by me, so an import followed by an update conveniently pulls me up to the latest vendor versions. Of course, for any files that I've modified (and thus exist