*some* files get checked out readonly
I've looked through the FAQ, but don't see an answer to this question. I've got a whole subdirectory (for example) in which some of the files *always* get checked out and updated read-only, while others don't. I don't have any special CVS variables (like CVS_READ, or whatever it is) set. In the repository, all of the permissions on the files are the same (444). There does not appear to be anywhere that permissions bits are being cached, yet some of the files are always 664 upon checkout (and after a checkin), and others (the same others) are 444. I'm using a pserver setup. Any ideas? This is driving me nuts. :-) Thanks, John -- John Klassa / [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: *some* files get checked out readonly
>>>>> On Thu, 15 Mar 2001, "Donald" == Donald Sharp wrote: Donald> Someone probably did a 'cvs watch on' command on those Donald> files. If this is the case in the corresponding directory in Donald> the repository should be a CVS directory. There will be a Donald> fileattr file in the CVS directory there. To turn it off do a Donald> 'cvs watch off ' Interestingly, yes, there are a lot of "watched" files... Wow. Does WinCVS "watch" files automatically? I can't think of any other way this would have happened, since the users I support certainly don't know about the "cvs watch" facility. :-) Thanks! John P.S. I don't know why I bother writing to info-cvs. I should just walk down the hall and ask you... You always know the answers. :-) -- John Klassa / [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Completely removing directories -- how?
>>>>> On Fri, 7 Apr 2000, "Matthias" == Matthias Kranz wrote: Matthias> What you have to do, is to remove every file inside the Matthias> target directory: ... Matthias> Then you have to remove the files from CVS control with ... Matthias> Afterwards you should run 'cvs update' with the '-P' flag Matthias> and the directory will disappear. I think the original poster's point is that the files in this directory get created automatically by the build process. The directory was never supposed to have been put into CVS in the first place, but was, by mistake. So, at this point, the directory is populated with build-related files which he doesn't want to have to remove every time he does an update... What he wants is to simply get rid of the directory, so far as CVS is concerned. The issue he's having is that when he does an udpate, it fails because there are files in that directory that CVS knows nothing about. (That's how I read the original question, anyway...) John -- John Klassa / [EMAIL PROTECTED]
Re: adding new files to project - Attic???
[EMAIL PROTECTED] said: >I have a problem using WINCVS on an NT machine... I added a new file >to my project, but whenever I try to add and commit the file to my >project, WINCVS copies it to a location using the correct path, but it >always adds a subdirectory called "Attic" where it puts the file. Btw, >I use no such directory (not even the name) in my project... Is this a >known feature or did I do/configure something wrong?? How to I add new >files? Sounds like you're adding the file on a branch... Since the file isn't logically in the main part of the tree, it doesn't appear in the directory itself, but rather in the Attic directory, where it's retrieved as necessary when you check out the branch you committed it on. This has been my observation, anyway... I'm by no means a CVS expert. John -- John Klassa / [EMAIL PROTECTED]
Re: Help
>>>>> On Thu, 11 May 2000, "galina" == [EMAIL PROTECTED] wrote: galina> I am getting this error message when trying to check out a galina> module that is on a different server. galina> bash-2.02$ cvs co doc cvs [checkout aborted]: connect to galina> fridge:2401 failed: Connection refused galina> I checked the CVSROOT and my username and password a thousand galina> times and it looks ok. Does anyone know why this is galina> happening? Um, server down? -- John Klassa / [EMAIL PROTECTED]
should I be able to create a conflict with this setup?
[ Sorry if you see this twice... I got confused as to which posting address to use. :-/ ] I've got the following situation... trunk dev branch test branch That is, the dev branch was created as a branch off the trunk, and the test branch was created as a branch off the dev branch. Changes are never made in the trunk... Everything happens in the dev branch. Occasionally, I merge everything from the dev branch down to the trunk, using tags that mark the spots at which previous merges occurred. For example, I'll tag the dev branch with a label like "MERGE-10", then I'll go into the trunk and do a "cvs update -dP -j MERGE-9 -j MERGE-10" to merge in the changes that occurred between MERGE-9 and MERGE-10. Now, when we're about ready to release, we cut the test branch and do testing there. Work continues in the dev branch, on the features for the next release. Occasionally, we find a bug in the test branch, so we fix it there, and then merge the changes down to the dev branch, just as we do from the dev branch down to the trunk. Then, as a matter of course, we also merge the dev branch down to the trunk, just so every branch, as well as the trunk, has the bug fix in it. Now, what happened to me today is that I did the merge from the test branch down to the dev branch, had a conflict, resolved it, and committed the changes. I tagged it as MERGE-20 (for the sake of example), then went to the trunk and did an update with "-j MERGE-19 -j MERGE-20". Oddly, I had one file with several conflicts in it, some large. This made absolutely no sense to me. The trunk and the dev branch are identical right after a merge, and the dev branch only has so much done to it before I go ahead and merge down to the trunk, so that it and the trunk are in sync again. If no changes occur on the trunk at all, how can I possibly get a conflict when I merge from the dev branch down to the trunk? Doesn't a conflict *require* that the file has changed in both places, in a way that conflicts? If not, what are the semantics of a "-j TAG1 -j TAG2", exactly? I'm deeply confused. Thanks, John ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
should I be able to create a conflict with this setup?
I've got the following situation... trunk dev branch test branch That is, the dev branch was created as a branch off the trunk, and the test branch was created as a branch off the dev branch. Changes are never made in the trunk... Everything happens in the dev branch. Occasionally, I merge everything from the dev branch down to the trunk, using tags that mark the spots at which previous merges occurred. For example, I'll tag the dev branch with a label like "MERGE-10", then I'll go into the trunk and do a "cvs update -dP -j MERGE-9 -j MERGE-10" to merge in the changes that occurred between MERGE-9 and MERGE-10. Now, when we're about ready to release, we cut the test branch and do testing there. Work continues in the dev branch, on the features for the next release. Occasionally, we find a bug in the test branch, so we fix it there, and then merge the changes down to the dev branch, just as we do from the dev branch down to the trunk. Then, as a matter of course, we also merge the dev branch down to the trunk, just so every branch, as well as the trunk, has the bug fix in it. Now, what happened to me today is that I did the merge from the test branch down to the dev branch, had a conflict, resolved it, and committed the changes. I tagged it as MERGE-20 (for the sake of example), then went to the trunk and did an update with "-j MERGE-19 -j MERGE-20". Oddly, I had one file with several conflicts in it, some large. This made absolutely no sense to me. The trunk and the dev branch are identical right after a merge, and the dev branch only has so much done to it before I go ahead and merge down to the trunk, so that it and the trunk are in sync again. If no changes occur on the trunk at all, how can I possibly get a conflict when I merge from the dev branch down to the trunk? Doesn't a conflict *require* that the file has changed in both places, in a way that conflicts? If not, what are the semantics of a "-j TAG1 -j TAG2", exactly? I'm deeply confused. Thanks, John ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Intro
>>>>> On Tue, 17 Oct 2000, "Lisa" == Lisa wrote: Lisa> We have people using both Windows and Linux platforms. Where is Lisa> the best place to acquire information (aside from the obvious Lisa> web sites)? Are there any decent reference works published? I found _Open Source Development with CVS_ (by Fogel) to be very helpful. John -- John Klassa / [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVSROOT or username in TCL
>>>>> On Wed, 25 Oct 2000, "Thomas" == Thomas Olausson wrote: Thomas> I'm trying to write a simple tcl script to echo out the Thomas> CVSROOT-variable or better yet, the username the user has when Thomas> logged in. Thomas> It's set through the Admin->Preferences, so I can't get it Thomas> from "env". I'm known for stating the obvious, so here goes... If this is inside a procedure, have you got a "global env" at the top of it? -- John Klassa / [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
