Re: Query regarding Branches in CVS
On Fri, Apr 04, 2003 at 08:50:49PM +0530, Amit Sood wrote: > Now if I have one file "ABC.txt" present in both branches,can I lock this > file > seperately for both the branches.This means if I have locked for main branch > it is still unlocked for RELBRANCH1 and other way around. I don't know. CVS doesn't really do very well at locking files or revisions so that only one person can make changes. By the way, a better term for this idea is "exclusive checkouts", to distinguish this form of locking from other forms (one of which I'll be talking about later). The main goal of CVS was to avoid needing exclusive checkouts, so that two (or more) people could work on the same file at the same time. That works well for text files, but for binary ones like JPEGs, MS-Word docs, etc., one really wants exclusive checkouts. But CVS's support for that is slim to none. There are features like "watches" and "cvs edit" that people find useful, but I don't really know much about them. > Also if two users make changes to "ABC.txt" one user make > changes to "ABC.txt" in main branch and other in RELBRANCH1 and > these changes at exactly same moment of time will CVS will be > able to handle such a scenario successfully. Yes. There are two issues, but CVS handles them both: - Keeping the two changes straight. That's just what branches are for. Someone who checks out the main branch, and someone else who checks out RELBRANCH1, will each get the "right" version. - Concurrent-update locking, to avoid corrupting the repository. CVS does this; if both users commit their changes at the same moment, one of them will have to wait a short time for the other one's commit to finish. -- | | /\ |-_|/ > Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / A distributed system is one on which I cannot get any work done, because a machine I have never heard of has crashed. - Leslie Lamport ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Exporting (best practices)
received two good suggestions. Thanks, I will look into both and figure what is best for our purposes. Thanks again...I really appreciate this listserv. brad -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Friday, April 04, 2003 1:06 PM To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: Re: Exporting (best practices) Tumy, Brad writes: > > We are developing a web application and our current configuration requires > that we "export" the CVS repository to the test server ($WEBROOT under > Apache) so that we can update and our testers can access the latest code. > The only way I have been able to ensure that all documents are updated is to > do a "rm -R *" in the $WEBROOT directory and then export to that directory. > Is there another way to do this without removing all of the existing files > first? Not really. It would probably be better to export to a new directory (like $WEBROOT.new), then rename the existing directory (to something like $WEBROOT.old), rename the new directory to $WEBROOT, and then remove the old directory. That requires enough space to hold two copies of the directory but minimizes the time when the tree is incomplete. -Larry Jones See if we can sell Mom and Dad into slavery for a star cruiser. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Exporting (best practices)
Tumy, Brad writes: > > We are developing a web application and our current configuration requires > that we "export" the CVS repository to the test server ($WEBROOT under > Apache) so that we can update and our testers can access the latest code. > The only way I have been able to ensure that all documents are updated is to > do a "rm -R *" in the $WEBROOT directory and then export to that directory. > Is there another way to do this without removing all of the existing files > first? Not really. It would probably be better to export to a new directory (like $WEBROOT.new), then rename the existing directory (to something like $WEBROOT.old), rename the new directory to $WEBROOT, and then remove the old directory. That requires enough space to hold two copies of the directory but minimizes the time when the tree is incomplete. -Larry Jones See if we can sell Mom and Dad into slavery for a star cruiser. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Exporting (best practices)
On Fri, 4 Apr 2003, Tumy, Brad wrote: > We are developing a web application and our current configuration requires > that we "export" the CVS repository to the test server ($WEBROOT under > Apache) so that we can update and our testers can access the latest code. > The only way I have been able to ensure that all documents are updated is to > do a "rm -R *" in the $WEBROOT directory and then export to that directory. > Is there another way to do this without removing all of the existing files > first? You could ``cvs update'' some sandbox to a specific revision, and then use rsync to synchronize it to the target location, so that only things that changed are copied over. There is probably a way to tell rsync not to copy the CVS/ directories. Scanning the rsync man page, I see that it not only has an exclude option similar to that of GNU tar, but also a way to exclude files in a similar way to what CVS ignore does. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Exporting (best practices)
We are developing a web application and our current configuration requires that we "export" the CVS repository to the test server ($WEBROOT under Apache) so that we can update and our testers can access the latest code. The only way I have been able to ensure that all documents are updated is to do a "rm -R *" in the $WEBROOT directory and then export to that directory. Is there another way to do this without removing all of the existing files first? Thanks, Brad Tumy Software Engineer Pragmatics, Inc. www.pragmatics.com ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
FW: CVS Lock Passing
I am working on a project to do some CVS mirroring and am looking at making a change to the CVS code to enable passing a write lock from an other process. Before I get to far though I wanted to see if anyone was already working code in that area and get some feedback on methods for doing this if it has been considered in the past. The method I am planning to use involves using cvslock to create the lock then running cvs with an extra command line param that is the lock name created by cvslock. This would then be used in lock.c:set_lock as a valid alternative to actually doing the atomic #cvs.lock directory creation. Thanks Ray Ramadorai ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Query regarding Branches in CVS
On Sat, 2003-04-05 at 01:20, Amit Sood wrote: > Hi all, > > I have one query regarding the working of CVS > > I am using CVS to maintain my project files and have released one version of > it.I have made a branch of the target at this juncture with tag RELBRANCH1 > Now simulatneous development is going on parallely on main branch and this > RELBRANCH1. > > Now if I have one file "ABC.txt" present in both branches,can I lock this > file > seperately for both the branches.This means if I have locked for main branch > it is still unlocked for RELBRANCH1 and other way around. Do you mean 'locked with cvs admin -l' or locked as in marked for editing with 'cvs edit', or locked in some other way? As I understand it, cvs admin -l locks a specific revision. cvs edit marks the file for editing, but I believe it will mark each branch separately. > Also if two users make changes to "ABC.txt" one user make changes to > "ABC.txt" > in main branch and other in RELBRANCH1 and these changes at exactly same > moment of > time will CVS will be able to handle such a scenario successfully. Yes. That's what branches are for. The changes in the branch version of the file will be saved to the branch, the changes in the main version will be saved to the main trunk. Jenn V. -- "Do you ever wonder if there's a whole section of geek culture you miss out on by being a geek?" - Dancer. My book 'Essential CVS' will be published by O'Reilly in 2003. [EMAIL PROTECTED] http://anthill.echidna.id.au/~jenn/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Query regarding Branches in CVS
Hi all, I have one query regarding the working of CVS I am using CVS to maintain my project files and have released one version of it.I have made a branch of the target at this juncture with tag RELBRANCH1 Now simulatneous development is going on parallely on main branch and this RELBRANCH1. Now if I have one file "ABC.txt" present in both branches,can I lock this file seperately for both the branches.This means if I have locked for main branch it is still unlocked for RELBRANCH1 and other way around. Also if two users make changes to "ABC.txt" one user make changes to "ABC.txt" in main branch and other in RELBRANCH1 and these changes at exactly same moment of time will CVS will be able to handle such a scenario successfully. Really stuck with the problem,any help will be really pull me out of this Thanks and Regards Amit Sood ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS _ Help
Aju writes: > > At present, I have created a single user 'cvs' which > can connect to the server. However, I would want > multiple users to connect to the CVS repository. What > do I do to achieve this? You add additional users to the machine or the CVSROOT/passwd file and set the permissions on your repository directories appropriately. > Also, I would like some of the folders in the CVS > repository to be unavailable to some of these users. I > understand that this has something to do with groups > and permissions to be set up on the Linux box, but > since I am new to this, I am not able to figure it > out. Learn how Unix/Linux permissions work, then read the section of the CVS manual on permissions. -Larry Jones My upbringing is filled with inconsistent messages. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Watch in Wincvs
Title: Watch in Wincvs hi The command would merge the rev 1.2 / 1.4 to ur local copy and after u need to commit it. $ cvs update -j 1.4 -j 1.2 filename.ext will remove all changes made between revision 1.2 and 1.4. Regarding the watches : You are fine for the action specifically cvs watch add s1.txt it would add and notify for all the actions but would clear its proper working / config also check the administrative files.. for their config regards Gurpreet S -Original Message-From: Vijay K. Srivastava [mailto:[EMAIL PROTECTED]Sent: Friday, April 04, 2003 12:03 PMTo: [EMAIL PROTECTED]Cc: [EMAIL PROTECTED]Subject: Watch in Wincvs Hello,1) When i am trying to adjusting watch with any file with following.$ cvs watch add -a edit -a commit s1.txtthen cvs starts running continuously for indefinite time.What is the reason of it.And what is the way to adjust a watch on any file.2) AAnd while doing merginglet version 1.2 any file has... :"microsoft"and version 1.4 of same file has .:"outlook"Then how these two version can be merged so that nest versionwill have... "Microsoft outlook"and Is it always neccesary that in merging there will be always conflictRegards.vijay ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
