RE: Merging in CVS

2002-11-22 Thread Daniels, Dave F [PCS]
The replacement he's referring to is Subversion. I don't think it's quite ready for prime time, but it looks like it will be very nice. Dave > -Original Message- > From: MacMunn, Robert [mailto:[EMAIL PROTECTED]] > Sent: Friday, November 22, 2002 1:54 PM > To:

RE: Merging in CVS

2002-11-22 Thread Daniels, Dave F [PCS]
>From my experience, technically the way CVS performs merges is fine. The biggest problem has been misunderstanding of how to correctly perform a merge, and this is a problem you can have with any tool. I've had instances where someone complained that CVS screwed up a merge, but when I dug a little

RE: problem commiting file to CVSROOT

2002-11-01 Thread Daniels, Dave F [PCS]
rator but had no problem with other files. Dave > -Original Message- > From: Todd Denniston [mailto:Todd.Denniston@;ssa.crane.navy.mil] > Sent: Friday, November 01, 2002 9:20 AM > To: Daniels, Dave F [PCS] > Cc: [EMAIL PROTECTED] > Subject: Re: problem commiting

RE: problem commiting file to CVSROOT

2002-11-01 Thread Daniels, Dave F [PCS]
> > > > -I'm trying to import files to CVSROOT/commitmessage/filename > > One generally adds files to an existing directory rather than > importing > them. That's what I'm doing. Please don't get hung up on semantics. > > I tried to manually add > > the ones not working, then make a change and

capture branch name with loginfo

2002-11-01 Thread Daniels, Dave F [PCS]
Is it possible to capture the branch information for an email created from a loginfo script? I'd like to include the branch a change was made to, not just the module. Thanks, Dave ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/

problem commiting file to CVSROOT

2002-11-01 Thread Daniels, Dave F [PCS]
I have several files I'm trying to commit to a subdirectory of CVSROOT, but only the ,v file is being created. I'm concerened about this because some users may make changes without realizing the files aren't being updated correctly on the server. To work around this problem temporarily, I've manual

RE: Can I check out a file without specifying the module it's in?

2002-10-31 Thread Daniels, Dave F [PCS]
It should be pointed out that this requires access to the server the CVS repository is on. I don't believe there's a way to do this with the CVS client. > -Original Message- > From: Zieg, Mark [mailto:mark.zieg@;lmco.com] > Sent: Thursday, October 31, 2002 11:50 AM > To: '[EMAIL PROTECTED]

controlled files to be deployed to different environments

2002-08-21 Thread Daniels, Dave F
For one of my projects I have a configuration file, say mail.properties, which I'm versioning in CVS. The contents of this file will be different for different environments, though. For example, the mail server for my development environment is different than for my production environment. Curren

RE: CVS version control & cold fusion

2002-05-31 Thread Daniels, Dave F
Sure, why not? Cold Fusion files are simply text files, and CVS handles text files very well. Dave > -Original Message- > From: Gail Milton [mailto:[EMAIL PROTECTED]] > Sent: Wednesday, May 29, 2002 2:38 PM > To: info-cvs > Subject: CVS version control & cold fusion > > > > Hello,

problems merging from branch to mainline

2002-05-29 Thread Daniels, Dave F
Hi, I'm having some trouble merging from a branch to the mainline. The latest branch version is 1.1.2.9, while the latest mainline version is 1.2. I'm running this command from a checked-out copy of the mainline: cvs update -j1.1.2.9 foo.jsp What I expected to happen was file 'foo.jsp' would be

cvs prune question

2002-04-17 Thread Daniels, Dave F
Hi, When updating a module using the command 'cvs update', CVS prints lines which look something like this. M project/src/com/company/Test1.java M project/src/com/company/Test2.java P project/src/com/company/Test3.java I know the M means merge, and I suspect the P means prune. Can someone c