Merging from one module into another

2004-06-23 Thread Jean-Christian Imbeault
At my company we have a repository with two projects (I hope I have the terminology right). One project is A and the other is A_DEV. Our developers work and commit only into A_DEV. When everything is ready for release we move the changes into A and release. My question is what is the easiest (or

Re: Locking Tags

2004-06-23 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Sandhya [EMAIL PROTECTED] writes: I received good mails about locking files and I was able to understand that its quite impossible in CVS. Well, advisory locks are possible, but generally considered undesirable. Now What I want to know is about

Undoing renaming a directory

2004-06-23 Thread Jean-Christian Imbeault
One of our developers just checked in new code (more than once) and by mistake renamed a directory from src to source. Is there a simple way to undo this? I've been reading the archives and it seems that there isn't ... Thanks, Jean-Christian Imbeault

Re: Merging from one module into another

2004-06-23 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jean-Christian Imbeault [EMAIL PROTECTED] writes: At my company we have a repository with two projects (I hope I have the terminology right). One project is A and the other is A_DEV. I suspect you mean 'module' here, but sure, calling it a

Re: Undoing renaming a directory

2004-06-23 Thread Frederic Brehm
At 03:16 AM 6/23/2004, Jean-Christian Imbeault wrote: renamed a directory from src to source What cvs command did the developer use to do this? I didn't think this was possible. Fred ___ Frederic W. Brehm, Sarnoff Corporation,

Ineroperability problem with Tortoise CVS

2004-06-23 Thread Mike Pumford
Just spotted a slight interoperability problem with Tortoise CVS and CVS 1.12.9. The new date formatting code confuses the Tortoise cvs log output parsing code as the new local time formatting of dates end up using - to separate the year/month/day fields instead of the / used in older versions

RE: Cvs admin command question - using on files existing on branc h also

2004-06-23 Thread Jim.Hyslop
[EMAIL PROTECTED] wrote: Jeeva Sarma writes: I have a question using cvs admin command to delete a revision of a file. If I deleted revision 1.7 of a file, which also exists on a branch at that revision, what will be the status of that file on the branch? A revision cannot be

RE: branch removal question

2004-06-23 Thread Don Butts
Title: branch removal question I asked this question last Friday but got no response. Was it poorly asked, not enough information, too ignorant for words? If I need to supply more information please let me know, I would be glad to. Thanks, Don Butts -Original Message-From:

Re: Deleting or disabling a user

2004-06-23 Thread Frederic Brehm
At 09:07 AM 6/23/2004, Ramanuj Singh wrote: The information transmitted is intended only for the person or entity to whom it is addressed and may contain confidential and / or privileged Material. Any review, re-transmission, dissemination or other use of or taking of any action in reliance

RE: branch removal question

2004-06-23 Thread Jim.Hyslop
Don Butts wrote: I asked this question last Friday but got no response. Was it poorly asked, not enough information, too ignorant for words? How about, this requires a few more brain cycles than were available at the time? :=) -Original Message- We are using cvs in

RE: Undoing renaming a directory

2004-06-23 Thread Jim.Hyslop
Jean-Christian Imbeault wrote: One of our developers just checked in new code (more than once) and by mistake renamed a directory from src to source. Is there a simple way to undo this? I've been reading the archives and it seems that there isn't ... Um, is it too obvious to suggest

RE: Merging from one module into another

2004-06-23 Thread Christopher.Fouts
Using your terminology, cvs co A cvs update -j A -j A_DEV (Resolve conflicts, if any) cvs commit -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] ] On Behalf Of Jean-Christian Imbeault Sent: Wednesday, June 23, 2004 2:36 AM To:

Re: branch removal question

2004-06-23 Thread Todd Denniston
Don Butts wrote: Content-Type: multipart/mixed; boundary1243246784== Please do not send MIME and/or HTML encrypted messages to the list. Plain text only, PLEASE! We are using cvs in somewhat of a non-standard way. We have a production cut of our compiled source that

RE: branch removal question

2004-06-23 Thread Paul Sander
Normally one would apply a tag to the versions that are ready for testing, and update the tag as bugs are fixed. Then apply a second tag to the code that reaches production quality. To apply the second tag, use the cvs rtag -r option. The bummer with this is that if you make bug fixes in your

RE: branch removal question

2004-06-23 Thread Paul Sander
--- Forwarded mail from [EMAIL PROTECTED] Don Butts wrote: I asked this question last Friday but got no response. Was it poorly asked, not enough information, too ignorant for words? I wouldn't remove the branches. I'm always reluctant to remove anything from the history. Instead of

RE: Undoing renaming a directory

2004-06-23 Thread Paul Sander
--- Forwarded mail from [EMAIL PROTECTED] Jean-Christian Imbeault wrote: One of our developers just checked in new code (more than once) and by mistake renamed a directory from src to source. Is there a simple way to undo this? I've been reading the archives and it seems that there isn't

RE: branch removal question

2004-06-23 Thread Jim.Hyslop
[EMAIL PROTECTED] wrote: Floating tags can also be used. For example, create a tag called PRODUCTION and apply it to the next release. Then just run cvs update in the production area, and the proper versions will appear. Yep, that's basically the idea I was trying to get across. The down

Re: Ineroperability problem with Tortoise CVS

2004-06-23 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Mike Pumford [EMAIL PROTECTED] writes: Just spotted a slight interoperability problem with Tortoise CVS and CVS 1.12.9. The new date formatting code confuses the Tortoise cvs log output parsing code as the new local time formatting of dates end

cvs [log aborted]: unrecognized operation error

2004-06-23 Thread Carter Thompson
Hi, I have a file that I'm getting an abort from cvs log on in my repository. $ cvs log appspack/oracle/ig/modules/ar/install/sql/obtig_ar_filter_pb.sql cvs [log aborted]: unrecognized operation '\x73' in /export/cvs/prodops/appspack/oracle/ig/modules/ar/install/sql/obtig_ar_f

Re: cvs [log aborted]: unrecognized operation error

2004-06-23 Thread Larry Jones
Carter Thompson writes: What's the best way to go about resolving this error? I've tried to find problems directly with the RCS file itself but I've been unable to find anything wrong with it and I'm afraid that I'm missing something obvious. That error does, indeed, mean that the RCS

RE: Merging from one module into another

2004-06-23 Thread Jean-Christian Imbeault
From: [EMAIL PROTECTED] Using your terminology, cvs co A cvs update -j A -j A_DEV (Resolve conflicts, if any) cvs commit That doesn't seem to work. I get: $ cvs co A [snip] $ cvs -n update -j A -j A_DEV cvs server: WARNING: global `-l' option ignored. cvs

How to keep developers separate from committers?

2004-06-23 Thread Jean-Christian Imbeault
My company has just decided to start using CVS. The system admin responsible for the CVS server is new to CVS and learning as we go along so we are running into some problems with how to layout our repository etc ... Please bare with me as I try and explain our situation :) We're trying to have