Re: Reimporting vendor projects where items have been deleted
Laine Stump writes: > > I'm glad this message came by again - I just did an import and saw the > that the behavior described by Larry below did not occur. Nothing is > marked for deletion by CVS either during the import or during > execution of the suggested "merging checkout" afterwards. The suggested merge command assumes that you won't import more than one release per day -- if you do, you need to use the explicit release tags for the merge rather than the "vendor" and "vendor:yesterday" that CVS suggests. (CVS can't suggest that itself since it has no way to know what release tag you used the last time.) -Larry Jones Oh, now don't YOU start on me. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Merge algorithm
Thanks for the replies... Tamas Eric Siegerman wrote: > > On Tue, Mar 20, 2001 at 01:20:33PM -0800, Pyatt, Scott wrote: > > Does anyone know for sure if diff3 is called and if not, what is used? Does > > anyone know if the algorithm is documented? > > It sure seems to be diff3. See src/rcscmds.c, function > RCS_merge(). > > -- > > | | /\ > |-_|/ > Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] > | | / > With sufficient thrust, pigs fly just fine. However, this is not > necessarily a good idea. > - RFC 1925 (quoting an unnamed source) > > ___ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Binary for Digital Unix V4.0D / Tru64 Unix
I am trying to find a CVS binary (client only, or full) for CVS 1.10.- Digital Unix V4.0D / Tru64 Unix. Does anyone have this, and can tell me where to get it, or (even better) e-mail it to me ? Thanks for all your help! Have an awesome day, Arthur Barrett ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: How did this file get into the Attic?
On Tue, Mar 20, 2001 at 08:55:35PM -0600, R Bresner wrote: > I've found some files in the Attic dirs without the "Dead" > state I was suspecting. These files are from way back in 95, You're right: > 1. Older cvs's didn't mark it as 'dead', just Attic'd it[.] (Before, CVS considered a file to be deleted if and only if its ,v file was in the attic. Now, of course, it's the "dead" revision that's authoritative; the attic is just a speed optimization.) Looks as though the dead-revision code first appeared in 1992: > Fri Nov 27 20:12:48 1992 K. Richard Pixley ([EMAIL PROTECTED]) > > Added support for adding previously removed files, as well as > adding and removing files in branches. > * commit.c [...] (remove_file): [...] > Remove files by committing dead revisions in the > appropriate branch. When removing files from the trunk, also > move the RCS file into the Attic. The ChangeLogs from back then don't show when releases were made, but I'm pretty sure this was some time after 1.3. Of course, your site may have been running such an ancient version in 1995 or later; especially since no final 1.4 release ever made it out -- only a couple of long-lived "alpha"s, which your people may have decided to avoid in favour of older but "more stable" code. -- | | /\ |-_|/ > Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / With sufficient thrust, pigs fly just fine. However, this is not necessarily a good idea. - RFC 1925 (quoting an unnamed source) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
How did this file get into the Attic?
I found this note by Mike Castle written 7-26-2000: CVS is doing two things when you delete a file: Moves it to the attic, and creates a new version with the state of "dead." True, true, I knew that. Now, did CVS _always_ do that? I've found some files in the Attic dirs without the "Dead" state I was suspecting. These files are from way back in 95, when my company first started using CVS. I don't know what version of cvs was in use at the time. The "oldtimers" from the '95 era say things like 'wha? wha? Sonny?' Now, I'm using 1.10.8. (1.11 soon, soon). Solaris server, rsh'ing from NT clients. I've checked all the branches that existed at that time, and none of them list the file as "dead" either. I grepped the ,v file, and found a comment "# ... deadlock...". The ,v files indicates the file has never been branched, I just noticed. So. How did it get in the attic in the first place? I assume 1. Older cvs's didn't mark it as 'dead', just Attic'd it? 2. Some crazed fool moved it in the repository manually. 3. Something else I don't know. Any suggestions? The reason I ask, is that with the recent testing of 1.11 ( and some folks with 1.10.8 also report) that these "undead" files are popping up in some branches, during normal cvs co's and updates. -- ...Because, as we all know, homeless guys in the movies are always really smart, as opposed to, you know, verbally abusive and inappropriately stained. -- Joal Ryan Robert Bresner Open Link Energy 713-590-7916 [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Reimporting vendor projects where items have been deleted
Eric Siegerman wrote: >On Tue, Mar 20, 2001 at 05:20:25PM -0800, Stephen Rasku wrote: >> Nathan Herring wrote: >> >I'd like to have the option on successive imports to mark as deleted any >> >files that previously existed on that vendor branch that are not in the >> >import. >> >> I don't see why this is necessary. If you do: >> >> cvs co -r vendor-v2 themodule >> >> It will not check out any modules that don't have the vendor-v2 tag. > >True. > >> For all intents and purposes it is deleted. > >Not true. If you do: > cvs co -r vendor themodule > >you *will* get the deleted files. You shouldn't. > Oh, yeah. That's right (you will and you shouldn't). -- Stephen Rasku E-mail: [EMAIL PROTECTED] Senior Software EngineerWeb:http://www.pop-star.net/ TGI Technologies ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Reimporting vendor projects where items have been deleted
> cvs co -r vendor-v2 themodule We actually check out themodule (usually we import to themodule/somevendor) to the trunk, not to any particular tag. Thus, this doesn't really work for us. > cvs co -j vendor-v1 -j vendor-v2 themodule > > cvs ci themodule Larry suggested this one. This works OK. One of our problems is that our client (MacCVSPro) doesn't actually schedule files for deletion with the merge, so there's no easy way to check in the deleted files. We, thus, need to perform the import in the client, and then do the merge, conflict resolution, and check in on the server (annoying, but possible). However, it seems that it is all a completely unnecessary step, since you already know the name of the vendor branch, and you can check whether any particular file in the import location already has that branch tag, but is not part of the import. In that case, you can just put another version on that vendor branch that is "deleted", and optionally tag it with the version tag used during import. No extra user steps required. Furthermore, everything is nice and tidy: the deleted version is on the branch, so it looks like the vendor deleted it (as indeed they did), as opposed to on the trunk, which looks like one of us deleted it. I did some manual ,v file editing to see if I could create such an item. I did, and it works like you'd expect. (I realise that this is a low utility addition. :) nh -Original Message- From: Stephen Rasku [mailto:[EMAIL PROTECTED]] Sent: Tuesday, March 20, 2001 5:20 PM To: Nathan Herring; [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: RE: Reimporting vendor projects where items have been deleted Nathan Herring wrote: > >Is there some place to make feature requests such as this one? > >I'd like to have the option on successive imports to mark as deleted any >files that previously existed on that vendor branch that are not in the >import. > >To wit, > >cvs import -m "version 1" themodule vendor vendor-v1 >>cvs creates themodule/file, with versions 1.1.1.1, 1.1, and "vendor" >vendor branch 1.1.1. >cvs import -m "version 2" themodule vendor vendor-v2 >>cvs notices that file isn't in the import, but it is on the "vendor" >branch, and so makes a new version 1.1.1.2 marking the file as deleted. > I don't see why this is necessary. If you do: cvs co -r vendor-v2 themodule It will not check out any modules that don't have the vendor-v2 tag. For all intents and purposes it is deleted. If you are making modifications to the source, then you should merge the changes to the head: cvs co -j vendor-v1 -j vendor-v2 themodule cvs ci themodule -- Stephen Rasku E-mail: [EMAIL PROTECTED] Senior Software EngineerWeb:http://www.pop-star.net/ TGI Technologies ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Reimporting vendor projects where items have been deleted
On Tue, Mar 20, 2001 at 05:20:25PM -0800, Stephen Rasku wrote: > Nathan Herring wrote: > >I'd like to have the option on successive imports to mark as deleted any > >files that previously existed on that vendor branch that are not in the > >import. > > I don't see why this is necessary. If you do: > > cvs co -r vendor-v2 themodule > > It will not check out any modules that don't have the vendor-v2 tag. True. > For all intents and purposes it is deleted. Not true. If you do: cvs co -r vendor themodule you *will* get the deleted files. You shouldn't. -- | | /\ |-_|/ > Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / With sufficient thrust, pigs fly just fine. However, this is not necessarily a good idea. - RFC 1925 (quoting an unnamed source) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Reimporting vendor projects where items have been deleted
I'm glad this message came by again - I just did an import and saw the that the behavior described by Larry below did not occur. Nothing is marked for deletion by CVS either during the import or during execution of the suggested "merging checkout" afterwards. Actually, there are times when this behavior is *good*, since it allows me to import "partial code drops" from 3rd parties who just send me a few files for a quick bugfix, rather than a full release. In most cacses it would be nice, though... > [EMAIL PROTECTED] writes: > > > > If I am importing a vendor project for the second or subsequent times > > on the same vendor branch, how can I mark the files that no longer > > exist in the vendor projects as deleted on the vendor branch? > > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] > Doing the merge that CVS suggests when there are conflicts (even if > there aren't any conflicts) will mark the appropriate files for > deletion. Committing the results of the merge will then delete them. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Reimporting vendor projects where items have been deleted
Nathan Herring wrote: > >Is there some place to make feature requests such as this one? > >I'd like to have the option on successive imports to mark as deleted any >files that previously existed on that vendor branch that are not in the >import. > >To wit, > >cvs import -m "version 1" themodule vendor vendor-v1 >>cvs creates themodule/file, with versions 1.1.1.1, 1.1, and "vendor" >vendor branch 1.1.1. >cvs import -m "version 2" themodule vendor vendor-v2 >>cvs notices that file isn't in the import, but it is on the "vendor" >branch, and so makes a new version 1.1.1.2 marking the file as deleted. > I don't see why this is necessary. If you do: cvs co -r vendor-v2 themodule It will not check out any modules that don't have the vendor-v2 tag. For all intents and purposes it is deleted. If you are making modifications to the source, then you should merge the changes to the head: cvs co -j vendor-v1 -j vendor-v2 themodule cvs ci themodule -- Stephen Rasku E-mail: [EMAIL PROTECTED] Senior Software EngineerWeb:http://www.pop-star.net/ TGI Technologies ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Reimporting vendor projects where items have been deleted
Is there some place to make feature requests such as this one? I'd like to have the option on successive imports to mark as deleted any files that previously existed on that vendor branch that are not in the import. To wit, cvs import -m "version 1" themodule vendor vendor-v1 >cvs creates themodule/file, with versions 1.1.1.1, 1.1, and "vendor" vendor branch 1.1.1. cvs import -m "version 2" themodule vendor vendor-v2 >cvs notices that file isn't in the import, but it is on the "vendor" branch, and so makes a new version 1.1.1.2 marking the file as deleted. Thx, nh -Original Message- From: Nathan Herring Sent: Sunday, February 25, 2001 2:43 PM To: '[EMAIL PROTECTED]' Cc: '[EMAIL PROTECTED]' Subject: RE: Reimporting vendor projects where items have been deleted Right, but you end up with version 1.2 on the main trunk marked as deleted, and it doesn't have the vendor tag for version 2. So, you suggest: cvs import -m "version 2" themodule vendor vendor-v2 cvs co -j vendor-v1 -j vendor-v2 themodule cvs ci -m "remove vendor files" cvs tag vendor-v2 This is OK, but it'd be better to have the option to auto-delete those files as version 1.1.1.2 on the vendor branch. nh -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] Sent: Friday, February 23, 2001 8:38 PM To: Nathan Herring Cc: [EMAIL PROTECTED] Subject: Re: Reimporting vendor projects where items have been deleted [EMAIL PROTECTED] writes: > > If I am importing a vendor project for the second or subsequent times > on the same vendor branch, how can I mark the files that no longer > exist in the vendor projects as deleted on the vendor branch? Doing the merge that CVS suggests when there are conflicts (even if there aren't any conflicts) will mark the appropriate files for deletion. Committing the results of the merge will then delete them. -Larry Jones ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Merge algorithm
On Tue, Mar 20, 2001 at 01:20:33PM -0800, Pyatt, Scott wrote: > Does anyone know for sure if diff3 is called and if not, what is used? Does > anyone know if the algorithm is documented? It sure seems to be diff3. See src/rcscmds.c, function RCS_merge(). -- | | /\ |-_|/ > Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / With sufficient thrust, pigs fly just fine. However, this is not necessarily a good idea. - RFC 1925 (quoting an unnamed source) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Our company is going to start using CVS, please include me on your e-mail list
Hi, Just learned that our company is going to start using CVS. We do outsourcing on all sorts of platforms. Please include me on your e-mail list. Sincerely, Linda Kelly Senior Quality Assurance Tester E-Mail: [EMAIL PROTECTED] Fax: 602-431-4466 Telephone:602-431-8036 Extension 214 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Another time question
Annette Waters writes: > > Could you please explain how the time is used by CVS. Is it used to > determine if a file has changed? Or, does it always look at the contents of > the files to determine changes? CVS looks at the timestamp first; if it hasn't changed, then CVS assumes that the file hasn't changed. If the timestamp is different, then CVS looks at the contents of the file to determine whether it has changed or not. -Larry Jones My "C-" firmly establishes me on the cutting edge of the avant-garde. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Merge algorithm
Title: RE: Merge algorithm I assumed that "cvs update -j..." was using diff3 as well. However, the behavior that I expect to see is not always consistent or at least not always intuitive. Although these odd scenarios are rare, they still happen. In order to better understand how CVS' merge works, I created a myriad of test cases. I then created the process and tools that allow my company to work on multiple branches. This was not trivial and continues to be a work in progress. I agree with Tamas that it would be a lot easier if the merge algorithm was documented. It would easy the creation of everyone's process and tools as well as give us an indication if the behavior we see is a "bug" or "feature". Does anyone know for sure if diff3 is called and if not, what is used? Does anyone know if the algorithm is documented? Thanks, -Scott -Original Message- From: Noel L Yap [mailto:[EMAIL PROTECTED]] Sent: Tuesday, March 20, 2001 12:19 PM To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: Re: Merge algorithm I think it just uses diff3. Noel [EMAIL PROTECTED] on 2001.03.19 12:42:26 To: [EMAIL PROTECTED] cc: (bcc: Noel L Yap) Subject: Merge algorithm Hi! I got another question... Is the merge algorithm used by CVS documented somewhere? I would really appreciate if someone could point me to it. Thanks in advance, Tamas ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs This communication is for informational purposes only. It is not intended as an offer or solicitation for the purchase or sale of any financial instrument or as an official confirmation of any transaction. All market prices, data and other information are not warranted as to completeness or accuracy and are subject to change without notice. Any comments or statements made herein do not necessarily reflect those of J.P. Morgan Chase & Co., its subsidiaries and affiliates. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs server with different names
> That's exactly what's happening, and it's the way it's supposed to > work. CVS uses the Root file to find the repository that the files > came from. If you want to use the same IP address for both locations > just use the "long form" (xxx.xxx.xxx.xxx) in both places. Probably that won't work because on the internal network I guess he is using a reserved ip and from home he uses a real ip. > Alternatively you can change the Root files (a bad idea) or check out a > new copy when you're remote (which probably is not what you want to > do). Or he could set up $HOME/.cvsrc like cvs -d :pserver:[EMAIL PROTECTED]:/path/to/repository the -d parameter overrides CVS/Root. Tamas ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs server with different names
That's exactly what's happening, and it's the way it's supposed to work. CVS uses the Root file to find the repository that the files came from. If you want to use the same IP address for both locations just use the "long form" (xxx.xxx.xxx.xxx) in both places. Alternatively you can change the Root files (a bad idea) or check out a new copy when you're remote (which probably is not what you want to do). -- Dave Strauss On Tue, 20 Mar 2001 11:30:08 -0800, "Aaron Lee" <[EMAIL PROTECTED]> wrote: > > I did, the IP is working and the telnet is working, if you look under > the CVS directory they have 3 files: Root, Entries and Repository. The > Root file actually contains a line saying > :pserver:alee@cvsserver:/home/cvs and I suspect wincvs is using this > line instead of the CVSROOT in the preference setting. > -Aaron > > -Original Message- > From: Szabó Tamás [mailto:[EMAIL PROTECTED]] > Sent: Tuesday, March 20, 2001 11:27 AM > To: Aaron Lee; [EMAIL PROTECTED] > Subject: Re: cvs server with different names > > > Hi! > > > where xxx.xxx.xxx.xxx is the IP address of cvsserver but wincvs still > > remember my old setting and refuse the new CVSROOT. Is there any way > to > > get around this? Thanks in advance! > > Try to ping xxx.xxx.xxx.xxx. > Try to telnet to xxx.xxx.xxx.xxx's 2401 port. If this is the port that > it uses. > > Can you do this things? > > Tamas > > ___ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs > ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Merge algorithm
I think it just uses diff3. Noel [EMAIL PROTECTED] on 2001.03.19 12:42:26 To: [EMAIL PROTECTED] cc: (bcc: Noel L Yap) Subject: Merge algorithm Hi! I got another question... Is the merge algorithm used by CVS documented somewhere? I would really appreciate if someone could point me to it. Thanks in advance, Tamas ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs This communication is for informational purposes only. It is not intended as an offer or solicitation for the purchase or sale of any financial instrument or as an official confirmation of any transaction. All market prices, data and other information are not warranted as to completeness or accuracy and are subject to change without notice. Any comments or statements made herein do not necessarily reflect those of J.P. Morgan Chase & Co., its subsidiaries and affiliates. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: cvs server with different names
I believe the line in Root takes precedence over whatever CVSROOT is set to. You can always just add a line to your hosts file for your cvs server so you can always use the name(vs the ip). The downside you will then be responsible for maintaining that ip-name mapping if your server ever changes ip. -Tony -Original Message- From: Aaron Lee [mailto:[EMAIL PROTECTED]] Sent: Tuesday, March 20, 2001 2:30 PM To: Szabó Tamás; [EMAIL PROTECTED] Subject: RE: cvs server with different names I did, the IP is working and the telnet is working, if you look under the CVS directory they have 3 files: Root, Entries and Repository. The Root file actually contains a line saying :pserver:alee@cvsserver:/home/cvs and I suspect wincvs is using this line instead of the CVSROOT in the preference setting. -Aaron -Original Message- From: Szabó Tamás [mailto:[EMAIL PROTECTED]] Sent: Tuesday, March 20, 2001 11:27 AM To: Aaron Lee; [EMAIL PROTECTED] Subject: Re: cvs server with different names Hi! > where xxx.xxx.xxx.xxx is the IP address of cvsserver but wincvs still > remember my old setting and refuse the new CVSROOT. Is there any way to > get around this? Thanks in advance! Try to ping xxx.xxx.xxx.xxx. Try to telnet to xxx.xxx.xxx.xxx's 2401 port. If this is the port that it uses. Can you do this things? Tamas ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs server with different names
Yes it does. You can override that only with the -d global parameter. In WinCVS 1.2(maybe in earlier releases too I don't know) the .cvsrc file is supported. So you had to put in your $HOME directory a file .cvsrc And write in it: cvs -d :pserver:[EMAIL PROTECTED]:/path/to/repository When you are at work simply rename the file. Tamas Aaron Lee wrote: > > I did, the IP is working and the telnet is working, if you look under > the CVS directory they have 3 files: Root, Entries and Repository. The > Root file actually contains a line saying > :pserver:alee@cvsserver:/home/cvs and I suspect wincvs is using this > line instead of the CVSROOT in the preference setting. > -Aaron > > -Original Message- > From: Szabó Tamás [mailto:[EMAIL PROTECTED]] > Sent: Tuesday, March 20, 2001 11:27 AM > To: Aaron Lee; [EMAIL PROTECTED] > Subject: Re: cvs server with different names > > Hi! > > > where xxx.xxx.xxx.xxx is the IP address of cvsserver but wincvs still > > remember my old setting and refuse the new CVSROOT. Is there any way > to > > get around this? Thanks in advance! > > Try to ping xxx.xxx.xxx.xxx. > Try to telnet to xxx.xxx.xxx.xxx's 2401 port. If this is the port that > it uses. > > Can you do this things? > > Tamas ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs server with different names
Hi! > where xxx.xxx.xxx.xxx is the IP address of cvsserver but wincvs still > remember my old setting and refuse the new CVSROOT. Is there any way to > get around this? Thanks in advance! Try to ping xxx.xxx.xxx.xxx. Try to telnet to xxx.xxx.xxx.xxx's 2401 port. If this is the port that it uses. Can you do this things? Tamas ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: cvs server with different names
I did, the IP is working and the telnet is working, if you look under the CVS directory they have 3 files: Root, Entries and Repository. The Root file actually contains a line saying :pserver:alee@cvsserver:/home/cvs and I suspect wincvs is using this line instead of the CVSROOT in the preference setting. -Aaron -Original Message- From: Szabó Tamás [mailto:[EMAIL PROTECTED]] Sent: Tuesday, March 20, 2001 11:27 AM To: Aaron Lee; [EMAIL PROTECTED] Subject: Re: cvs server with different names Hi! > where xxx.xxx.xxx.xxx is the IP address of cvsserver but wincvs still > remember my old setting and refuse the new CVSROOT. Is there any way to > get around this? Thanks in advance! Try to ping xxx.xxx.xxx.xxx. Try to telnet to xxx.xxx.xxx.xxx's 2401 port. If this is the port that it uses. Can you do this things? Tamas ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvs server with different names
Hi CVSusers, My company is using CVS to do our version control and the current setup is to have the CVSROOT setup to be like the following (inside the company intranet): :pserver:alee@cvsserver:/home/cvs but when I work from home using DSL I change the Preferences setting to :pserver:[EMAIL PROTECTED]:/home/cvs where xxx.xxx.xxx.xxx is the IP address of cvsserver but wincvs still remember my old setting and refuse the new CVSROOT. Is there any way to get around this? Thanks in advance! -Aaron ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
What is LOCK and how to live with it?
Dear CVS-men, I was trying to commit a newer version of a binary file (SarcinaAnnotation.xls) but apparently did not succeed. The Lock appears to block the commit attempt. Would you please take a look at the msg and if possible suggest the remedy? 1:36pm serges@tin ~/website/annotatorWeb/docs > cvs commit SarcinaAnnotation.xls Checking in SarcinaAnnotation.xls; /seq/software/src/Annotation/cvsroot/website/annotatorWeb/docs/SarcinaAnnotation.xls,v <-- SarcinaAnnotation.xls new revision: 1.18; previous revision: 1.17 cvs [commit aborted]: could not open lock file `/seq/software/src/Annotation/cvsroot/website/annotatorWeb/docs/,SarcinaAnnotation.xls,': File exists What file(s) should I modify/erase/add in/from/to the repository in order to be able to commit this bin file? Thank you very much, Serge begin:vcard n:Smirnov;Serge tel;fax:(617) 258-0395 tel;work:(617) 252-1925 x-mozilla-html:TRUE org:Whitehead Institute / MIT;Center for Genome Research adr:;;320 Charles St, Cambridge MA 02139 version:2.1 email;internet:[EMAIL PROTECTED] title:Software Engineer fn:Serge Smirnov, PhD end:vcard
cvs upgradation
Hi We have CVS server on Unix and windows NT machines as clients.In these machines,there is a cvs client installed(by someone before me,I couldn't find the version info in Readme or any file)Using this, developers can checkout/commit from the command prompt.I want to upgrade the client.Where can I find this software and what is the latest version?We don't want to use WinCVS or any GUI client. I have downloaded CVS 1.11 for Unix.Will this have the client as well which I can install in NT machine? Also before installing cvs 1.11,should the old one be removed(just the exe) In the INSTALL file,it says 'A normal build of CVS will create an executable which supports local, server, or client CVS' Does it mean once I run configure and make,I can use the same exe as the client in NT? Pls clarify the above. Thanks a lot, Anita Chacko __ Do You Yahoo!? Get email at your own domain with Yahoo! Mail. http://personal.mail.yahoo.com/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Another time question
If I'm right then the time is always used to determine if the file is modified. The timestamp of the file is compared to the timestamp saved in the Entries file. But if you didn't change the file, you only "touch" it and try to commit then the file will not be really commited. Tamas Annette Waters wrote: > > Could you please explain how the time is used by CVS. Is it used to > determine if a file has changed? Or, does it always look at the contents of > the files to determine changes? > > ___ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Another time question
Could you please explain how the time is used by CVS. Is it used to determine if a file has changed? Or, does it always look at the contents of the files to determine changes? ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvs update
Hello, Is there any option to tell to the cvs update to ignore the files that are in the repository but not in the working directory. I want to update, in one step, only the files that I have checkout. Thanks in advance. Rui Cordeiro ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: commit to branch
Larry Jones wrote: > > Martin Entlicher writes: > > > > Can please someone explain to me when commit to a branch is supposed to > > work ? > > I believe the only time that's valid is with a newly-added file or if > the existing file is already the most recent revision on the branch (in > which case there's no point in specifying the branch explicitly). > > > I have a file on the main trunk with Up-to-date status and want to > > commit the *same* file to a branch. > > Then merge it. In a working directory on the branch, do: > > cvs up -j HEAD TestFile.java > cvs ci -m "message" TestFile.java > > -Larry Jones > Yes, thanks for the replies. I know, that I can do a merge on the branch with the HEAD. But I thought, that "cvs ci -r .." makes it simpler. I want to have two exactly the same revisions on the main trunk and on the branch. We have branched stable version of our software and when doing bug fixes that applies to the main trunk as well as to the branch, I have to merge it in the second working where the branch is checked out and resolve conflicts. Is it possible to add a support to force commit to a different branch without having to do merging and resolving conflicts ? Otherwise -r option to commit has not much sense IMO if it doesn't work in this case. It would speed up my work. Thanks, Martin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: commit to branch
Martin Entlicher writes: > > Can please someone explain to me when commit to a branch is supposed to > work ? I believe the only time that's valid is with a newly-added file or if the existing file is already the most recent revision on the branch (in which case there's no point in specifying the branch explicitly). > I have a file on the main trunk with Up-to-date status and want to > commit the *same* file to a branch. Then merge it. In a working directory on the branch, do: cvs up -j HEAD TestFile.java cvs ci -m "message" TestFile.java -Larry Jones He just doesn't want to face up to the fact that I'll be the life of every party. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: files mode 001 in repository
Francesc Guasch writes: > > Hi. I got a problem. When a file is created in the repository, > its permissions are 001, so it fails locking and crashes. > > I checked the user umask and it's fine. Where else can I look. inetd's umask -- it's the server's umask that dictates the permissions in the repository, not the client's. -Larry Jones It COULD'VE happened by accident! -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: commit to branch
Hi! > But when I do: > > cvs ci -m "message" -r MyBranch TestFile.java > > it fails with: > > cvs commit: Up-to-date check failed for `TestFile.java' > cvs [commit aborted]: correct above errors first! > > But the file is Up-to-date on the main trunk. Yes. But probably the file is not up-to-date on the branch. By specifying -r MyBranch the commit will be done on the MyBranch branch => the up-to-date check will be made on the TestFile.java that is on MyBranch. You made the branch and after that you(or someone else) modified the TestFile.java on the branch and commit it of course. That's while the up-to-date check fails. I think that you should update your file cvs up -r MyBranch TestFile.java Solve the conflicts if any and use commit after that. You don't have to use -r because -r is sticky, so you are on the branch. cvs ci TestFile.java Now if you want you can update with the -A parameter to clear the sticky tag and return to the main trunk. Tamas ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
commit to branch
Hi, Can please someone explain to me when commit to a branch is supposed to work ? I have a file on the main trunk with Up-to-date status and want to commit the *same* file to a branch. But when I do: cvs ci -m "message" -r MyBranch TestFile.java it fails with: cvs commit: Up-to-date check failed for `TestFile.java' cvs [commit aborted]: correct above errors first! But the file is Up-to-date on the main trunk. I use cvs 1.11 on Solaris 8. What can I do to get it to work ? Thanks. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: files mode 001 in repository
Hi! Francesc Guasch wrote: > > Hi. I got a problem. When a file is created in the repository, > its permissions are 001, so it fails locking and crashes. Try to set the CVSUMASK variable. The permisions of directory and files created in the repository should be controlled by this variable. See 2.2.2 File permissions in the Cedreqvist manual. Tamas > I checked the user umask and it's fine. Where else can I look. > I tried to do chmod g+s to the directory but it didn't help. > > I'm stuck. Where can I research further ? Thank you very much. > > -- > - frankie - > > ___ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: files mode 001 in repository
Francesc Guasch wrote: > > Hi. I got a problem. When a file is created in the repository, > its permissions are 001, so it fails locking and crashes. > I missed to say the server is solaris-2.6 and cvs-1.11 and client is 1.10.8. Could this be the guilty ? -- - frankie - ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
files mode 001 in repository
Hi. I got a problem. When a file is created in the repository, its permissions are 001, so it fails locking and crashes. I checked the user umask and it's fine. Where else can I look. I tried to do chmod g+s to the directory but it didn't help. I'm stuck. Where can I research further ? Thank you very much. -- - frankie - ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
[RE: mailing list]
Jean marc Harang a écrit : > Hey, Keyth, > > Use : http://mail.gnu.org/mailman/listinfo/info-cvs > > Bye, > > Jean marc > > Keith Luu a écrit : > >> Hi could yoou please add me to the mailing list. >> >> Thanks, >> Keith >> >> ___ >> Info-cvs mailing list >> [EMAIL PROTECTED] >> http://mail.gnu.org/mailman/listinfo/info-cvs > ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
mailing list
Hi could yoou please add me to the mailing list. Thanks, Keith ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVS command hangs with commit
Hi, I am experiencing some connection problem with our cvs server. Basically cvs is hanging everytime I execute and update, commit, add command. Whether I am connecting to the server with pserver of ssh does not matter, the command is always hanging. If I attempt to checkout a module, it works. After a while, I am getting the following message: cvs [commit aborted]: end of file from server (consult above messages if any) I traced the cvs client and it appears that the command always hangs when it sends the file to server. On the server side, the temporary directory is created, the file is also there but it's empty. Any help on that issue would be really great!.. Thanks, David Kornmann -- Here is my client config: Win2k, cvs 1.1, secured connection to server with SecureCRT + port forwarding (pserver 2401). Here is my server config: RedHat Linux OS. Concurrent Versions System (CVS) 1.10.7 (client/server) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
