Re: Checkout without \r's
You could compile cvs for Cygwin - its Unix-like environment doesn't put \r into text files. (You may need to set your Cygwin filesystem as 'binary' - I don't know if that still applies.) But the simplest way is probably to check out as normal and then run the files through dos2unix or a Perl script or whatever. -- Ed Avis [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS merge
I think the problem is the start and end points of your merge. If I have a trunk, and I created a branch from that trunk, tagging it at the point it was created, I would use the following to merge the branch back into the trunk: -j branch_CREATED -j branch Often this can simply be abbreviated as -j branch If you are doing something more complicated than this, please tell us the structure of the branches involved. There are additional details on this subtle and complex feature here, in the manual under the Branching and Merging section: http://www.cvshome.org/docs/manual/cvs-1.11.7/cvs_5.html#SEC54 I advise you to read it carefully, or you will get into trouble. [EMAIL PROTECTED] wrote on 11/11/2003 09:23:19 PM: Hi, I don't think my following merge result is correct. I did a merge in branch1 to join branch2 as following command: branch1$ cvs -q update -Pd -kk -j branch1 -j branch2 There is only one file shown me the conflicts by and comments embedded in the file. Many other files in branch1 are simply replaced by branch2 source files and created .#file1.h.1.2.3, .#file2.c.1.2.5 For example, the file1.h in branch1 includes three functions A(), B() and C(). The file1.h in branch2 has only two functions A() and B(). I expected that the merged new file would include A(), B() and C(), but to be surprised, the new merged file has only A() and B(), same as branch2 source file. The function C() was simply lost. Is this normal behavior or am I missing something here? (CVS version 1.10 for Window, I guess, it is irrelevant) Thank you. yh __ Do you Yahoo!? Protect your identity with Yahoo! Mail AddressGuard http://antispam.yahoo.com/whatsnewfree ___ 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: Checkout without \r's
Jim writes: That's an assumption about the file that is incorrect... it didn't start with \r's in it... and I need them to not be there. Then it's not a text file, by definition, no matter how much you think it is. -Larry Jones Hello, local Navy recruitment office? Yes, this is an emergency... -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Checkout with \r's
Jim writes: How can I check out a file on Linux with \r's ? By checking it in on Linux with \r's. Either the \r's are part of the line separator or they're part of the data -- you can't have it both ways. As part of a build process I use a SHA1 of the source as part of the versioning information. The same code on both windows and linux should generate the same SHA1. Not if you're including the line separators in the hash. -Larry Jones I won't eat any cereal that doesn't turn the milk purple. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: cvs user statistics
On Mon, 2003-11-10 at 16:13, Wim Bertels wrote: Houdi, is there a good way to obtain (/report) user statistics, (these user are cvs users), like for example: alfred worked for 56% on project1, joe worked for 14% on project1, mark worked for 45% on project2, You can get some stats and charts and such using StatCVS - here's an example: http://ai-app-prog.rubyforge.org/statcvs/ and here's the StatCVS page: http://statcvs.sf.net/ Yours, Tom ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Checkout without \r's
Okay - under Linux, 'how do I checkout WITH \r's?' that's easy - put em in the file, check it in, and check it out... but woe to the windows user - who now get's \r\r\n's. under windows, how to do the same? Well if I have complete control over all options, use cygwin CVS and UNIX style file endings - problem is that's an option, and I can't seem to convince everyone to use the same options. Otherwise, what I see is not what I get. If one is developing and working with both platforms, his tools better be able to work with each other's TEXT without difficulty. How can I even guarantee that the source used to build the same object on different platforms was the same? I know I see even more sign of segregation of text and binary in CVS today than in prior versions... it's really too bad that everyone knows and is comfortable with CVS... if only they had realized sooner, this mentality that 'what you checkin is NOT what you checkout' would not have been so concrete, and this ... would not be an issue. If there is no spoon...there are no bugs, and there IS no spoon. - Original Message - From: Larry Jones [EMAIL PROTECTED] To: Jim [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Sent: Wednesday, November 12, 2003 7:04 AM Subject: Re: Checkout without \r's Jim writes: That's an assumption about the file that is incorrect... it didn't start with \r's in it... and I need them to not be there. Then it's not a text file, by definition, no matter how much you think it is. -Larry Jones Hello, local Navy recruitment office? Yes, this is an emergency... -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVS Commit sets file time backward
Concurrent Versions System (CVS) 1.12.2 (client) When I do a CVS commit of a changed file (for example this morning) the timestmp of the last mod was : 8:31 after the commit the timestamp on the file was 1:09 (hmm seems my clock on my CVS server is off also... since at 8:32 it thought the time was 9:09) Jim ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Can't define or checkout a module
Dear All: I have winCVS 1.13 installed locally on my machine. For authentication I am using Local settings. I have created a repository on network mapped drive called R:\cvsrepos. That's where my CVSROOT is defined. Now, it seems that I can import a populated direcorty into my CVSROOT successfully via the wincvs interface running the Import Module from selectionu menue. When I try to checkout that module to a local folder, I'll call ANYWHERE I get a message saying: cvs checkout -P R:\CVSREPO\module1 (in directory C:\ANYWHERE) cvs checkout: cannot find module `R:\CVSREPO\module1' - ignored * CVS exited normally with code 1 * WHY??? __ Do you Yahoo!? Protect your identity with Yahoo! Mail AddressGuard http://antispam.yahoo.com/whatsnewfree ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Checkout without \r's
wincvs has an option to check files out with *NIX line terminators. Maybe this will do what you want. But really that is not the point. Inherent in the idea of a text file is that you should be able to edit it. The convention is that *NIX and DOS terminate the line endings differently on a text file. The file has not changed. It is merely conforming with the standards of the platform - or else (clever editors aside) how would you be able to edit it? Try opening a *NIX-style text file in Notepad and see what you get. if only they had realized sooner, this mentality that 'what you checkin is NOT what you checkout' would not have been so concrete, and this ... would not be an issue. I would suggest that for the majority of CVS users, this is already not an issue. If you are going to use a hashing algorythm to check if the file has changed, then you need to remove the line terminators before making the hash, because they are not part of your data, but an os-specific part of the way the data is being stored. And you might want to consider removing whitespace too, because presumably you are only interested in noticing if a *meaningful* change has happened to the file. Alternatively you could use CVS to tell you if the file has changed. Andy Jones Tapestry Software ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Checkout with \r's
On Tue, 11 Nov 2003 20:40:59 -0800, Jim wrote How can I check out a file on Linux with \r's ? As part of a build process I use a SHA1 of the source as part of the versioning information. The same code on both windows and linux should generate the same SHA1. You need to normalize your text prior to calculating the SHA1; simply don't include the line-endings when you calculate the hash. (If you look at the standards documentation, you'll note that text is frequently encoded in some well-defined format for most cryptographic standards; text file does not constitute such a format.) Failing that, your only options are to check the files in as binary, to only check the SHA1 on one platform, or calculate the reference hashes twice (once on windows, once on Linux) and consider a match with either to be correct. It's a fact of life that different platforms use different line endings, and client tools expect this. You could of course also use the cygwin client on Windows and configure it to use text files with UNIX line endings. This was the default at one time. Regards, Geoff ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: How to script extraction of a single file?
Bryce Nesbitt (spam account) writes: /usr/bin/cvs -lf -Qd /tmp/cvsroot_test co -p -r1.2 module/file.zip Is slow because of the pipe. Since when are pipes slow?!? That is the way to do what you want. -Larry Jones I wonder if you can refuse to inherit the world. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS Commit sets file time backward
If I'm not mistaken, the CVS server operates in UTC, not local time. Given the time zone settings on your CVS server, does that look right to you? Jim said: Concurrent Versions System (CVS) 1.12.2 (client) When I do a CVS commit of a changed file (for example this morning) the timestmp of the last mod was : 8:31 after the commit the timestamp on the file was 1:09 (hmm seems my clock on my CVS server is off also... since at 8:32 it thought the time was 9:09) Jim -- Michael Kohne[EMAIL PROTECTED] You should be smarter than the equipment you are trying to operate. -- Matt Osborne ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Checkout without \r's
Jim writes: If one is developing and working with both platforms, his tools better be able to work with each other's TEXT without difficulty. No, you just need to learn to use the tools on the platform they were intended for instead of pretending that the two platforms are interchangeable. If there were only two platforms in the world, you might have a point, but there are more text file formats in heaven and earth than are dreamt of in your philosophy. The fact that the DOS and Unix text file formats are similar makes it tempting to pretend that they're the same, or at least can be used interchangably, but the fact remains that they are, in reality, *different* and are *not* interchangeable. I know I see even more sign of segregation of text and binary in CVS today than in prior versions... it's really too bad that everyone knows and is comfortable with CVS... if only they had realized sooner, this mentality that 'what you checkin is NOT what you checkout' would not have been so concrete, and this ... would not be an issue. CVS's role in life is to manage source code in a platform independent manner. A DOS file is not useful on an IBM mainframe or on an Alpha running VMS. It may not even be useful on a Unix-like system (some compilers *will* object to the CRs). But a source file using the local text file conventions *is* useful. If you want to get out byte-for- byte what you checked in, then use binary mode; that's what it's for. -Larry Jones They say winning isn't everything, and I've decided to take their word for it. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Checkout with \r's
Geoff Beier writes: You could of course also use the cygwin client on Windows and configure it to use text files with UNIX line endings. This was the default at one time. It's also an extraordinarily bad idea. Trying to pretend that the native text file format is something other than what it really is leads to confusion, insanity, and, ultimately, disaster. If horses had six legs, how many legs would two horses have? Eight. Supposing something doesn't make it so. -Larry Jones Honey, are we out of aspirin again? -- Calvin's Dad ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Can't understand usage of 'cvs admin -bxxx .',desiring for help.
13.3 Reverting to the latest vendor release You can also revert local changes completely and return to the latest vendor release by changing the `head' revision back to the vendor branch on all files. For example, if you have a checked-out copy of the sources in `~/work.d/wdiff', and you want to revert to the vendor's version for all the files in that directory, you would type: $ cd ~/work.d/wdiff $ cvs admin -bWDIFF . Up is a section of CVS manual.I can't understand it really.first,it said that 'if you have a checked-out copy of sources...',what is the release reverion of this source?As an example,I have a third-party sources with two release reversion named soft-1.0 and soft-1.1first,I import soft-1.0 like this:cvs import -m1.0 soft company release1and then I checked the source and modified some file.cvs checkout soft//Modified some file for my own purpose and checkin.It seemed my checkin is the 'HEAD' trunk.Now the official release the new release soft-1.1.To recored it:cvs import -m1.1 soft company release2OK,problem occurs.the cvs noticed:cvs import -m 111 my upidea release2C my/a.c1 conflicts created by this import.Use the following command to help the merge:cvs checkout -jprev_rel_tag -jrelease2 myIf I want use new release and want new release merged my own modify.I'm sure I may do like upon.But if I want lost all my modifed for my ownproblem is solved in the new rel! ease and much more perfect than I do.So it seemed I shoud reverting to the lastest vendor release,is this right?And I think what I shout do is.cvs checkout -r release2 softcvs admin -brelease2 .Here the cvs told me:cvs admin: Administrating .RCS file: /home/dumb/cvsroot/my/a.c,vcvs admin: /home/dumb/cvsroot/my/a.c,v: Symbolic name release2 is undefined.cvs admin: RCS file for `a.c' not modified.The manual use a command 'cvs admin -bWDIFF .' to explain this.I don't know what the 'WDIFF' means and where it come from?It's shout be anreversion.But in the manual it not said where the symbolic name WDIFF came from.I have no idea about this.Can somebody help?Thanks a lot. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
