RE: how to identify a release
Don't know about that but one thing that has come up before it that you should look at using rtag instead of tag so that the operations getting recording in the history. Matt -Original Message- From: Andreas Wolff [mailto:[EMAIL PROTECTED]] Sent: 13 June 2001 18:55 I want to identify a release of my source. I understood that the tag mechanism can be used for this purpose. But in this case I have to apply the tag to each file. I am afraid that in big projects with lots of files this may take a reasonable amount of time. Is there a better (faster) way to identify a release? -- If you have received this e-mail in error or wish to read our e-mail disclaimer statement and monitoring policy, please refer to http://www.drkw.com/disc/email/ or contact the sender. -- ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: IPv6
From: Donald Sharp [EMAIL PROTECTED]
Subject:Re: IPv6
Date: Tue, 12 Jun 2001 21:30:29 +0900
Message-Id: [EMAIL PROTECTED]
| Just try cvs -d :pserver:user@::1:/some/path/cvsroot co module.
| Note, that ::1 is an ipv6 address for localhost.
|
| Couldn't you just put localhost instead of :1?
| I would always try to use the machines name instead
| of the ip address.
If cvs don't allow ipv6 address,
cvs should have `-6' as global option like this:
cvs -6 -d :pserver:user@localhost:/some/path/cvsroot co module
Someone will want to specify address scope {linklocal, site, global}.
--
KOIE Hidetaka [EMAIL PROTECTED]
I'm not IPv6 user, now.
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
Re: AW: update errors
Hi Thanks for your reply and sorry for the lateness of mine. My copy was a copy that I had checked-out. I checked it out again and it solved the problem. Thanks, Rob On Tuesday 12 June 2001 12:45 pm, Schell Walter wrote: I'm getting errors when I call update, are these happening because the CVS/Entries file is missing? How can I get these files back from the repository? Rename the directory classes und do a checkout classes; seems to me, as if the directory is not the result of an earlier checkout and therefor no CVS-directories exist. (Maybe it is the source of an import). Walter ___ 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
Trouble committing a Rational Rose model after changes made.
Hi We are using WinCvs 1.2. WeI have trouble to commit the file after changes were made. The model has CAT files, but we make everything read only before starting. When we do a commit, the process executes with code 0, but the status of the file remains Mod. file. Then we thought that maybe it didn't refresh properly. After we refreshed still no change. Then we thought that maybe we must commit the CAT file first. Did that. No problems with the commit. Then tried to commit the model: Executes with code 0 but the status is still Mod. file. The only way we can save the changes is by saving a copy of the model, removing it from CVS, committing the remove, then copying the saved model back in and commiting it. But that is not the way we want to continue working. What could be the problem and how do we fix it? Kind regards Anette van Aswegen ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Advantages and Disadvantages of CVSNT
on Donnerstag, 14. Juni 2001 00:59 you wrote: What about the capabilities of commitinfo, loginfo, taginfo. I would imagine those must be limited on an NT server, since it won't have all the same commands available. (I'm just guessing though, as I've never run it on NT. It's something you should investigate though). Also, what about the more flexible remote administration (Of course that's and argument for Unix rather than NT in general, so presumably your admin has already chosen to ignore that point). And I would reiterate the point that CVSNT is a *port* of CVS, not just another platform that the main source can be built for. That means that there is a delay before new features/bugfixes in the main code find their way into cvsnt. Yeah, those are very good points. I thought about loginfo etc. too, but I don't think that those could be convincing arguments for my admin, but anyway thanks for the hints. Maybe I'll convince him. Thanks a lot and best regards from germany. -- Mathias Meyer mediaworx berlin AG Fon: (0 30) 27 58 02 48 Fax: (0 30) 27 58 02 00 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Problem at Importing
Hi, I have problem in importing the source code using rsh. I have created a repository on 164.164.27.225 and repository path is /homes/grp3/sangeeta/trial Now I want to create the project which is under work on some other machine. So I set following things. I can login using rsh on 164.164.27.225. FRIENDexport CVSROOT=:ext:[EMAIL PROTECTED]:/homes/grp3/sangeeta/trial FRIENDexport CVS_RSH=rsh FRIENDpwd /home_people/sangeeta/work FRIENDcvs import -m try work start1 start2 ksh: cvs: not found cvs [import aborted]: end of file from server (consult above messages if any) Can some body help me ? thanks and regards, Sangeeta ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVS tags
Hello all, I have a question regarding CVS tags. I want to have a list of files that are in a certain release. Is there a command within (win)cvs that allows me to specifiy a certain tag and then generates a listof all the files that havethattag? Thanks in advance, Tim WensinkGet Your Private, Free E-mail from MSN Hotmail at http://www.hotmail.com. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS
Antonio D'Ottavio wrote: Good Morning, I've some question for you about CVS, on the Client side I've WinCVS installed and for server side I had prepared a machine with Linux Mandrake 8, it has already included CVS but how I can make it work like a Server, how can I set the password for the user, please help me, I already loose 10 days on this ... thank you Antonio D'Ottavio Have you looked at the manual? http://www.cvshome.org/docs/manual/cvs_2.html#SEC26 -Matt ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Windows-Linux question.
My experience is that cvs convert file to the client OS format. I work on a project on sourceforge and when I checkout files on windows, they end with CR+LF. When other members of the team check them out on Linux, the files end with LF only. Though, I don't know if that behavior apply when the server is running on Windows. -Message d'origine- De : [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]De la part de Mikael Aronsson Envoyé : mercredi 13 juin 2001 13:03 À : [EMAIL PROTECTED] Objet : Windows-Linux question. Hi ! I have cvs running on a Windows computer, but I need to compile the files on a Linux box, when I checkout the files on Windows all lines end with CR+LF (normal MS format), is there a way to tell cvs to checkout the files as unix format (LF only) ? Mikael ___ 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: Can't check out a newly created module
Hi Anette, seems to me as if you already have a version of your module in your working area (that you may just have imported into cvs-control). In this case you get a conflict. Try to move the folder you just have imported to some backup folder and checkout to a cleared area... Michael -- Dipl.-Math. Michael Lukaschek, Software Development Dimension 3D-Systems GmbH / Interzart AG 3D Commerce Telephone: +49-511 390884-0 Facsimile: +49-511 390884-10 mailto:[EMAIL PROTECTED] http://www.dimension-3d.com Anette Van Aswegen schrieb: Hi I created a new module (folder) and group on the server. Now I would like to check it out through WinCvs 1.2 but after the checkout process nothing is checked out. I receive the following messages: cvs checkout -P Sebi (in directory C:\cvsroot) cvs checkout: in directory Sebi: cvs checkout: cannot open CVS/Entries for reading: No such file or directory cvs server: Updating Sebi *CVS exited normally with code 0* The directory does exist. I can view it on the server. It lies with all the others which have no problem to check out. I thought that maybe he will not checkout because nothing exists in the module yet. So I created a text file in the directory. I still receive the same message. Must I let CVS know there is a new module or sort of activate the new module. How can I fix the problem? Thank you for your help. Anette van Aswegen ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs Kryptographische Unterschrift mit S/MIME
Merging
Can somebody give me advice on how to resolve merging conflicts using CVS120 with a 1.2 patch. The only difference between the main trunk and the branch is some comments that I added. I tried to resolve the conflict by deleting the comments on both the main and the branch but I still get a conflict. Thanks, Alex Flores
Re: 'cvs log' for changes between revisions shows all revisions for files that do not have the tag
Hi,
you can also try to use datetime stamps. These datetime stamp of tag can
be retrieved by `cvs history -xT -t ${mytag}`. Note that "retagging" of
any file moves the datetime stamp to current time so it might become
unreliable.
You can also try cvs2cl.pl from http://www.red-bean.com/cvs2cl/
I personally use cvs2cl.pl hacked for HTML output, because I don't like
frames. Examples of such html changelog can be found at
http://www.netbeans.org/downloads.html
Alexander Kamilewicz wrote:
"Jones, Clinton A" wrote:
After experimenting with cvs2cl.pl, I found that I could not get the log
information that I want. The problem is not the script, but in how the cvs
log command works.
I'm trying to create a ChangeLog that shows only changes that occurred
between two releases, but if a file has been added to the project, and does
not contain the given tag, the log command displays a warning and then
continues to show all revisions for this file anyway. The problem is that
now the output includes comments for a file that was never involved in the
latest release.
For example:
1. File 'A' in some_project has tags 'rel1' and 'rel2'.
2. A new file 'B' is added to some_project but the developer does not want
this file to be in the build yet, so the file has never been tagged as rel2.
3. I use the following command for all changes in some_project between rel1
and rel2:
cvs log -rrel1:rel2
4. For file 'A', the output shows all log messages that occurred between
'rel1' and 'rel2' as expected.
For file 'B', the log command does not find a 'rel2' revision.
Unfortunately the default behavior is to display all changes to the file
from the first revision up to the tip. Now the log output is polluted with
changes made to a file that was not tagged for the build.
IMHO tagging of file is not good way how to propagate the file to
build/release. We at NetBeans use the trunk and "release*" branches for
files which are going to be built. Other files which are under
development and are incompatible with current versions must be branched
off the trunk to private branch and after all major changes are done,
the files are merged back to trunk. This is also true for releases,
which are also branched out of trunk and further stabilization
development continues on branch until release.
In your case cvs history will not be reliable as I suggested above.
Is there some other way to get only the information that I need?
Have you looked at cvs2html.pl? It's not _exactly_ what you want, but
can give you good reports on what's new in the repository.
-Rudolf
--
-
Rudolf Balada
NetBeans Release Engineer
Release Engineering Engineer, Forte Tools
Tel.: +420 (2) 3300 - 9187 (x49187)
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Can not commit
jquest jquest wrote: cvs [server aborted]:can not commit files as 'root' Where is the problem . cvs will not let you commit as root. Check the list archives for more info. -Matt ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Merging
Alex Flores wrote: Can somebody give me advice on how to resolve merging conflicts using CVS120 with a 1.2 patch. Do you mean WinCVS 1.2? CVS is only at 1.11.x The only difference between the main trunk and the branch is some comments that I added. I tried to resolve the conflict by deleting the comments on both the main and the branch but I still get a conflict. Thanks, Alex Flores You should only edit the working copy (the one with conflict markers in it). http://cvshome.org/docs/manual/cvs_10.html#SEC86 -Matt ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS tags
Tim Wensink wrote: Hello all, I have a question regarding CVS tags. I want to have a list of files that are in a certain release. Is there a command within (win)cvs that allows me to specifiy a certain tag and then generates a list of all the files that have that tag? cvs -q get -r releasetag logfile http://www.cvshome.org/docs/manual/cvs_16.html#SEC121 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Advantages and Disadvantages of CVSNT
Mathias Meyer wrote: on Donnerstag, 14. Juni 2001 00:59 you wrote: What about the capabilities of commitinfo, loginfo, taginfo. I would imagine those must be limited on an NT server, since it won't have all the same commands available. (I'm just guessing though, as I've never run it on NT. It's something you should investigate though). SNIP Yeah, those are very good points. I thought about loginfo etc. too, but I don't think that those could be convincing arguments for my admin, but anyway thanks for the hints. Maybe I'll convince him. Thanks a lot and best regards from germany. -- Hey, *info is not a point for your admin. it's a point for your boss wink. Sorry boss I can't provide that *info because the admin decided I MUST us NT. :) -- __ I'd crawl over an acre of 'Visual This++' and 'Integrated Development That' to get to gcc, Emacs, and gdb. Thank you. -- Vance Petree, Virginia Power ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Problem at Importing
Sangeeta Gupta wrote: FRIENDcvs import -m try work start1 start2 ksh: cvs: not found cvs [import aborted]: end of file from server (consult above messages if any) The CVS executable isn't in your path on the server. You need to set the CVS_SERVER variable on the client side to a complete path to the executable or add the correct directory to your path on the server. http://cvshome.org/docs/manual/cvs_2.html#SEC28 Derek -- Derek Price CVS Solutions Architect ( http://CVSHome.org ) mailto:[EMAIL PROTECTED] CollabNet ( http://collab.net ) -- It does me no injury for my neighbor to say there are twenty gods or no god. It neither picks my pocket nor breaks my leg. - Thomas Jefferson ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS tags
Alexander Kamilewicz wrote: cvs -q get -r releasetag logfile cvs -qn co -r releasetag module Derek -- Derek Price CVS Solutions Architect ( http://CVSHome.org ) mailto:[EMAIL PROTECTED] CollabNet ( http://collab.net ) -- It'll take a miracle to get you out of Casablanca and the Germans have outlawed miracles. - Sydney Greenstreet as Senor Ferrari, _Casablanca_ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS tags
Derek R. Price wrote: Alexander Kamilewicz wrote: cvs -q get -r releasetag logfile cvs -qn co -r releasetag module Very true. I was wrong. Need more coffee ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
can checkin id come from login-- not CVS/Root?
Because it has many junior developers, my company uses a centralized development model. Rather than having each developer load tomcat on his or her laptop, they all develop on one central app server. We would like to use cvs, but in order to do so we must solve one problem. If there is one working copy of a project checked out onto this central app server and it was checked out by developer A, can developer B make some changes and check them in and have it recorded in the repository that HE is responsible for the change-- not developer A. In other words, can I get cvs to use my login at check-in time rather than what is stored in theCVS/Root files of the working copy? Thanks. --Rami Friedman ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Maintaining branches...
On Wed, Jun 13, 2001 at 11:12:16PM -0700, Paul Sander wrote: Is there some reason why the -j's could not be recorded in the CVS directory, and corrected with each update? The joins shouldn't be recorded in the repository until the commits are done anyway. -j makes a notation in the CVS directory (or appends an existing one if multiple joins are done between commits), and -r and -A clear out the notations. At commit time, the notations could be recorded in the RCS files for future use. When a file is in this merged-but-not-committed state, rm foo; cvs up foo should do one of two things: - erase the -j notation, or - redo the merge(s) Redoing the merge would basically make -j sticky -- but only a little sticky, like a PostIt Note :-) -- since it should become unstuck after a commit. The former would preserve consistency with current behaviour; the latter would bring this case more into line with the rest of CVS. Which of these would be preferable? -- | | /\ |-_|/ 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
Modules problem
I'm having a difficulty trying to figure out how to layout the modules file to do the following. Let's assume the repository looks like: /dir1 /dir1/dir2 /dir1/dir2/file1.cpp /dir1/dir2/file1.h /shared /shared/sdir1 /shared/sdir1/sfile1.cpp I want my local workspace to look like: /dir1 /dir1/dir2 /dir1/dir2/file1.cpp /dir1/dir2/file1.h /dir1/dir2/sdir1 /dir1/dir2/sdir1/sfile1.cpp My problem: - as far as I can tell, ampersand modules can only bring in sub-modules at the top level, as a sibling of dir2 in my example above - with this modules line: dir1 dir1 sdir1 So... how can you do an ampersand module that will be inserted into a subdirectory of a module, instead of a top-level directory of the module? Kostur, Andre.vcf
Re: Maintaining branches...
[ On Wednesday, June 13, 2001 at 23:12:16 (-0700), Paul Sander wrote: ] Subject: Re: Maintaining branches... Is there some reason why the -j's could not be recorded in the CVS directory, and corrected with each update? That's an intersting idea. It would certainly help me remember what I'm going in a given working directory, if nothing else! The joins shouldn't be recorded in the repository until the commits are done anyway. That's true! -j makes a notation in the CVS directory (or appends an existing one if multiple joins are done between commits), and -r and -A clear out the notations. At commit time, the notations could be recorded in the RCS files for future use. That's the trick. How do you do that without impacting RCS compatability??? Is doing it as part of the commit message sufficient? -- Greg A. Woods +1 416 218-0098 VE3TCP [EMAIL PROTECTED] [EMAIL PROTECTED] Planix, Inc. [EMAIL PROTECTED]; Secrets of the Weird [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Stale CVS locks
[ On Thursday, June 14, 2001 at 08:32:04 (+0300), Reinstein, Shlomo wrote: ] Subject: RE: Stale CVS locks We work on CVS on both Windows NT/2000 and Linux. Most of the time we work on Windows, and Windows users are used to Ctrl+Break... Anyway, yesterday Larry Jones told me I should still send a bug report about this, so I did that. About SIGQUIT, I don't know, I am not familiar with the Unix signals. Mabye it's possible (though somehow I doubt it) to do the equivalent of: stty quit ^Y stty intr ^\ which under unix will re-map SIGQUIT to CTRL-Y and then make CTRL-\ generate SIGINT, though it would disable CTRL-C since only one key can be mapped to any given signal at a time. I.e. instead of having CTRL-BREAK generate SIGQUIT, if indeed that's what it's doing, make it generate SIGINT instead. The other alternative might be to use a clue-by-4 to convince the developers to use CTRL-C instead. -- Greg A. Woods +1 416 218-0098 VE3TCP [EMAIL PROTECTED] [EMAIL PROTECTED] Planix, Inc. [EMAIL PROTECTED]; Secrets of the Weird [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Can't check out a newly created module
Joel Belog writes: How did you create the module/folder in CVS, did you import it? Unless you import the module, CVS does not know about it. Just doing a mkdir in the repository won't do it. That is completely wrong -- doing a mkdir in the repository *is* all that is needed. -Larry Jones These things just seem to happen. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Can't check out a newly created module
Anette Van Aswegen writes: cvs checkout -P Sebi (in directory C:\cvsroot) cvs checkout: in directory Sebi: cvs checkout: cannot open CVS/Entries for reading: No such file or directory Most likely, the directory you're trying to checkout into (Sebi) already exists; checkout really wants to create a new directory. -Larry Jones These child psychology books we bought were such a waste of money. -- Calvin's Mom ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Problem at Importing
Sangeeta Gupta writes: FRIENDexport CVSROOT=:ext:[EMAIL PROTECTED]:/homes/grp3/sangeeta/trial FRIENDexport CVS_RSH=rsh FRIENDpwd /home_people/sangeeta/work FRIENDcvs import -m try work start1 start2 ksh: cvs: not found http://cvshome.org/docs/manual/cvs_2.html#SEC28 CVS is not in your path on the server when you connect with rsh (that is, ``rsh 164.164.27.225 cvs'' will produce the same error). You need to set $CVS_SERVER: export CVS_SERVER=/usr/local/bin/cvs -Larry Jones Oh, now YOU'RE going to start in on me TOO, huh? -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Can not commit
jquest jquest writes: cvs [server aborted]:can not commit files as 'root' When committing a permanent change, CVS makes a log entry of who committed the change. If you are committing the change logged in as root (not under su or other root-priv giving program), CVS cannot determine who is actually making the change. As such, by default, CVS disallows changes to be committed by users logged in as root. (You can disable this option by commenting out the definition of CVS_BADROOT in 'options.h' before building CVS. -Larry Jones If I get a bad grade, it'll be YOUR fault for not doing the work for me! -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Undeliverable Message
To:[EMAIL PROTECTED]@Servers[Chris Garrigues [EMAIL PROTECTED]] Cc:[EMAIL PROTECTED]@Servers[[EMAIL PROTECTED]] Subject: Re: [ANNOUNCE] cvs-nserver 1.11.1.1 released Message not delivered to recipients below. Press F1 for help with VNM error codes. VNM3043: Andre Pohl@TPAI [EMAIL PROTECTED] VNM3043 -- MAILBOX IS FULL The message cannot be delivered because the recipient's mailbox contains the maximum number of messages, as set by the system administrator. The recipient must delete some messages before any other messages can be delivered. The maximum message limit for a user's mailbox is 10,000. The default message limit is 1000 messages. Administrators can set message limits using the Mailbox Settings function available in the Manage User menu (MUSER). When a user's mailbox reaches the limit, the user must delete some of the messages before the mailbox can accept any more incoming messages. -- Original Message Follows -- [ On Thursday, June 14, 2001 at 11:15:55 (-0500), Chris Garrigues wrote: ] Subject: Re: [ANNOUNCE] cvs-nserver 1.11.1.1 released Is this eventually going to be merged into the main CVS source? I sure as hell hope not! -- Greg A. Woods +1 416 218-0098 VE3TCP [EMAIL PROTECTED] [EMAIL PROTECTED] Planix, Inc. [EMAIL PROTECTED]; Secrets of the Weird [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs --- This Mail has been checked for Viruses Attention: Encrypted Mails can NOT be checked ! *** Diese Mail wurde auf Viren ueberprueft Hinweis: Verschluesselte Mails koennen NICHT geprueft werden! ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: [ANNOUNCE] cvs-nserver 1.11.1.1 released
[ On Thursday, June 14, 2001 at 11:15:55 (-0500), Chris Garrigues wrote: ] Subject: Re: [ANNOUNCE] cvs-nserver 1.11.1.1 released Is this eventually going to be merged into the main CVS source? I sure as hell hope not! -- Greg A. Woods +1 416 218-0098 VE3TCP [EMAIL PROTECTED] [EMAIL PROTECTED] Planix, Inc. [EMAIL PROTECTED]; Secrets of the Weird [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Undeliverable Message
To:[EMAIL PROTECTED]@Servers[[EMAIL PROTECTED]] Cc: Subject: Re: Maintaining branches... Message not delivered to recipients below. Press F1 for help with VNM error codes. VNM3043: Andre Pohl@TPAI [EMAIL PROTECTED] VNM3043 -- MAILBOX IS FULL The message cannot be delivered because the recipient's mailbox contains the maximum number of messages, as set by the system administrator. The recipient must delete some messages before any other messages can be delivered. The maximum message limit for a user's mailbox is 10,000. The default message limit is 1000 messages. Administrators can set message limits using the Mailbox Settings function available in the Manage User menu (MUSER). When a user's mailbox reaches the limit, the user must delete some of the messages before the mailbox can accept any more incoming messages. -- Original Message Follows -- [ On Wednesday, June 13, 2001 at 23:12:16 (-0700), Paul Sander wrote: ] Subject: Re: Maintaining branches... Is there some reason why the -j's could not be recorded in the CVS directory, and corrected with each update? That's an intersting idea. It would certainly help me remember what I'm going in a given working directory, if nothing else! The joins shouldn't be recorded in the repository until the commits are done anyway. That's true! -j makes a notation in the CVS directory (or appends an existing one if multiple joins are done between commits), and -r and -A clear out the notations. At commit time, the notations could be recorded in the RCS files for future use. That's the trick. How do you do that without impacting RCS compatability??? Is doing it as part of the commit message sufficient? -- Greg A. Woods +1 416 218-0098 VE3TCP [EMAIL PROTECTED] [EMAIL PROTECTED] Planix, Inc. [EMAIL PROTECTED]; Secrets of the Weird [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs --- This Mail has been checked for Viruses Attention: Encrypted Mails can NOT be checked ! *** Diese Mail wurde auf Viren ueberprueft Hinweis: Verschluesselte Mails koennen NICHT geprueft werden! ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS tags
"Derek R. Price" wrote: Alexander Kamilewicz wrote: cvs -q get -r releasetag logfile cvs -qn co -r releasetag module This is also not correct for directory structures, because "-n" don't/cannot work recursively. Other thing is, that you must do the checkout to directory, where the module is missing. In other case you will get only list of updated files, but not the list with files tagged with "releasetag". These lists might be different. So I assume that the correct command is without "n" and must be run in directory where the module is not present (usually empty directory). cvs -q co -r releasetag module logfile -Rudolf -- - Rudolf Balada NetBeans Release Engineer Release Engineering Engineer, Forte Tools Tel.: +420 (2) 3300 - 9187 (x49187) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: (no subject)
Alex Flores wrote: I need help please. I can not merge a branch into my main trunk. I am a ClearCase man. I can not figure out how to use the CVS merge utility or how to resolve conflicts. http://cvshome.org/docs/manual/cvs_5.html#SEC54 cvs commit: Examining . cvs [commit aborted]: end of file from server (consult above messages if any) D:\CVS\CVSwork\practice_folder This is generally a bad sign. There's a section of the manual on trouble shooting a CVS server, and this looks like the symptoms of the common problem of inetd not actually launching a CVS server, but your previous sucessful updates tell me that something else might be wrong, like your commit is causing a core dump. Likely this means you have an old and buggy version of the server or a poorly hacked version of the server. Derek -- Derek Price CVS Solutions Architect ( http://CVSHome.org ) mailto:[EMAIL PROTECTED] CollabNet ( http://collab.net ) -- I will not squeak chalk. I will not squeak chalk. I will not squeak chalk... - Bart Simpson on chalkboard, _The Simpsons_ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS - Obsolete files
At 3:13 PM -0400 6/14/01, Larry Jones wrote: Lamar Seifuddin writes: How can I set up CVS to checkout source directories without getting the obsolete files? Remove them (with cvs rm). They'll still be in the repository, just in the Attic subdirectory with the latest revision marked dead, so their revision history will still be available. -Larry Jones On a related note, I keep running into a problem managing third party sources. Sometimes we will get a drop of a source tree and some of the files have been deleted i.e. they are not present in the import (any more). When I import and then update a workspace, the missing files are not removed. Is there any way to make this happen automatically. I can see that it is a thorny problem in the general case, but it also seems that for this common case there might be something if only I could find it... - rmgw http://www.electricfish.com/hawkfish/ Richard Wesley Electric Fish, Inc. [EMAIL PROTECTED] I would like the audience to know, that although I read this stuff, I _don't_ write it. - Wallace Greenslade, _The Goon Shows: The Scarlet Capsule_ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: [ANNOUNCE] cvs-nserver 1.11.1.1 released
[ On Thursday, June 14, 2001 at 13:12:49 (-0500), Chris Garrigues wrote: ] Subject: Re: [ANNOUNCE] cvs-nserver 1.11.1.1 released Okay, let me ask my real question then...in what time frame do you expect PAM support in CVS? No security related code should ever be added to CVS. It must only be removed! If you want PAM support then use a remote job execution tool that mimics RSH or SSH and which has PAM support (some SSH versions do this now!)! -- Greg A. Woods +1 416 218-0098 VE3TCP [EMAIL PROTECTED] [EMAIL PROTECTED] Planix, Inc. [EMAIL PROTECTED]; Secrets of the Weird [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: (no subject)
On Thu, Jun 14, 2001 at 01:58:11PM -0500, Alex Flores wrote: D:\CVS\CVSwork\practice_foldercvs update -j rel_1_0_practice practice_alex.cpp M practice_alex.cpp RCS file: d:/cvs/practice_folder/practice_alex.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.2 Merging differences between 1.5 and 1.5.2.2 into practice_alex.cpp rcsmerge: warning: conflicts during merge That this point, you need to edit the file and resolve the conflicts. Look for lines with , ===, and in them. They mark the boundaries of the conflicting areas. D:\CVS\CVSwork\practice_foldercvs update -j 1.5.2.2 -j 1.9 practice_alex.cpp C practice_alex.cpp I'm not sure this command makes send here. 1.9 is on the main branch, which you said you were working on already. So what this command will do is create a diff between 1.5.2.2 and 1.9 and apply it. Since that would essentially be applying the same set of changes back onto yourself, it doesn't seem to make much sense. D:\CVS\CVSwork\practice_foldercvs commit cvs commit: Examining . cvs [commit aborted]: end of file from server (consult above messages if any) You can't do a commit until you resolve the conflicts above. mrc -- Mike Castle [EMAIL PROTECTED] www.netcom.com/~dalgoda/ We are all of us living in the shadow of Manhattan. -- Watchmen fatal (You are in a maze of twisty compiler features, all different); -- gcc ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Maintaining branches...
On Thu, Jun 14, 2001 at 03:26:31PM -0400, Derek R. Price wrote: Mike Castle wrote: And I think that this complete merging happens less than you might think. It cannot handle the situation where a specific set of changes is migrated before another (i.e., -j tag1 -j tag2). It may not even be off of an immediate branch, but rather a couple over. What can't it handle about this and why? Originally I was thinking only highwater marks. But I guess something like a .newsrc style range/set would work. (Ok, what IS that data structure properly called?) But consider the following sequence: branch at 1.1. Branch has 1.1.0.1 and 1.1.0.2. 1.1.0.3 is made, and that particular change is needed immediately on the branch branch, so only it is moved over. So 1.2 == 1.1 + 1.1.0.3. Changes 1.1.0.4 and 1.1.0.5 are made. Now we want to migrate all of those changes onto the main branch. So now we have to be able to tell cvs to: diff -r1.1 -r1.1.0.2, apply patch diff -r1.1.0.3 -r1.1.0.5, apply patch mrc -- Mike Castle [EMAIL PROTECTED] www.netcom.com/~dalgoda/ We are all of us living in the shadow of Manhattan. -- Watchmen fatal (You are in a maze of twisty compiler features, all different); -- gcc ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Undeliverable Message
To:[EMAIL PROTECTED]@Servers[Chris Garrigues [EMAIL PROTECTED]] Cc:[EMAIL PROTECTED]@Servers[CVS-II Discussion Mailing List [EMAIL PROTECTED]] Subject: Re: [ANNOUNCE] cvs-nserver 1.11.1.1 released Message not delivered to recipients below. Press F1 for help with VNM error codes. VNM3043: Andre Pohl@TPAI [EMAIL PROTECTED] VNM3043 -- MAILBOX IS FULL The message cannot be delivered because the recipient's mailbox contains the maximum number of messages, as set by the system administrator. The recipient must delete some messages before any other messages can be delivered. The maximum message limit for a user's mailbox is 10,000. The default message limit is 1000 messages. Administrators can set message limits using the Mailbox Settings function available in the Manage User menu (MUSER). When a user's mailbox reaches the limit, the user must delete some of the messages before the mailbox can accept any more incoming messages. -- Original Message Follows -- [ On Thursday, June 14, 2001 at 13:12:49 (-0500), Chris Garrigues wrote: ] Subject: Re: [ANNOUNCE] cvs-nserver 1.11.1.1 released Okay, let me ask my real question then...in what time frame do you expect PAM support in CVS? No security related code should ever be added to CVS. It must only be removed! If you want PAM support then use a remote job execution tool that mimics RSH or SSH and which has PAM support (some SSH versions do this now!)! -- Greg A. Woods +1 416 218-0098 VE3TCP [EMAIL PROTECTED] [EMAIL PROTECTED] Planix, Inc. [EMAIL PROTECTED]; Secrets of the Weird [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs --- This Mail has been checked for Viruses Attention: Encrypted Mails can NOT be checked ! *** Diese Mail wurde auf Viren ueberprueft Hinweis: Verschluesselte Mails koennen NICHT geprueft werden! ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Maintaining branches...
-Original Message- From: Ralph Mack [mailto:[EMAIL PROTECTED]] Sent: Wednesday, June 13, 2001 10:52 PM To: [EMAIL PROTECTED] Subject: Re: Maintaining branches... [Quoth I... :-)] 0. select a reference version and a from and to version 1. make a diff from the reference version to the from version 2. make a diff from the reference version to the to version 3. merge the diffs (preferably with optional user input), and 4. apply the result to the to version. As I lay in bed thinking about all this, it suddenly occurred to me that, since CVS is always using the root as its reference version, CVS (and its ancestor RCS) can get away with not recalculating any diffs at all during an update but merely selecting from among the diffs calculated during prior commits. This is a significant time savings. A commit becomes the only operation that actually calculates a diff as a side-effect. CVS does not always use the root as its reference version. The restriction is not that CVS does not permit merging, but that it does not itself have an automatic way of keeping track of what has been merged where. The user can keep track of this information with a tag, or externally, or can just merge the last change (which is usually what you want to do anyway). A commit is not the only operation to create a diff; the cvs diff command will normally also do so (although that diff is not kept by CVS; if you want to keep it as a diff you can save it yourself). For example, cvs diff -r 1.10.2.6 -r 1.12.6.3 foo.C will create a diff between the version of foo.C in two different branches. (If you like, cvs update -r 1.23.2.3 foo.C; cvs update -j 1.10.2.6 -j 1.12.6.3 foo.C will attempt to apply the difference between 1.10.2.6 and 1.12.6.3 to 1.23.2.3, which is usually not a useful thing to do.) Is this true? If so, it seriously restricts the kind of merge behavior that CVS can support, but I can see why it was done. Lots of other things about CVS that seemed a little odd also suddenly become comprehensible. It restricts the kind of merge behavior that can be done without further ado and record-keeping. It does not restrict the ability to arbitrarily merge if the user is willing to keep track of things in some way. We use a tag to show what has been merged already. How hard is it to extract three different revisions of the same file to a temp area outside of the normal checkout tree using CVS? If I were going to do that, I'd do three separate cvs update -r ... commands, moving each to the appropriate directory after the update. Again, it is not something that CVS automatically does with a simple command out of the box. (I'm contemplating what a seperate graphical merge utility layered on CVS might need to do.) If I were to use this approach in order to use a different merge I would write a script to do it. There is certainly no reason why it can't be done, but for most purposes CVS's merging is quite adequate. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS - Obsolete files
Richard Wesley writes: On a related note, I keep running into a problem managing third party sources. Sometimes we will get a drop of a source tree and some of the files have been deleted i.e. they are not present in the import (any more). When I import and then update a workspace, the missing files are not removed. After importing the new vendor release, do: cvs co -j previous_rel_tag -j new_rel_tag module The resulting working directory will have the deleted files marked for deletion -- simply commit the changes. If there were conflicts caused by the import, CVS would suggest doing a similar checkout except that it uses vendor_branch_tag:yesterday instead of the previous vendor release tag (which it has no way of knowing), and vendor_branch_tag instead of the new vendor release tag. The two are equivalent except that specifying the release tags explicitly allows CVS to track deleted files, so you can resolve conflicts and mark deleted files with one checkout. -Larry Jones If I get a bad grade, it'll be YOUR fault for not doing the work for me! -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
KEEP 100% OF THE REVENUE YOU GENERATE!
Dear Friend, AS SEEN ON NATIONAL TV : ''Making over half million dollars every 4 to 5 months from your home for an investment of only $25 US Dollars expense one time'' THANKS TO THE COMPUTER AGE AND THE INTERNET! = BE A MILLIONAIRE LIKE OTHERS WITHIN A YEAR!!! Before you say ''Bull'', please read the following. This is the letter you have been hearing about on the news lately. Due to the popularity of this letter on the Internet, a national weekly news program recently devoted an entire show to the investigation of this program described below, to see if it really can make people money. The show also investigated whether or not the program was legal. Their findings proved once and for all that there are ''absolutely NO laws prohibiting the participation in the program and if people can follow the simple instructions, they are bound to make some mega bucks with only $25 out of pocket cost''. DUE TO THE RECENT INCREASE OF POPULARITY RESPECT THIS PROGRAM HAS ATTAINED, IT IS CURRENTLY WORKING BETTER THAN EVER. This is what one had to say: ''Thanks to this profitable opportunity. I was approached many times before but each time I passed on it. I am so glad I finally joined just to see what one could expect in return for the minimal effort and money required. To my astonishment, I received total $ 610,470.00 in 21 weeks, with money still coming in''. Pam Hedland, Fort Lee, New Jersey. - Here is another testimonial: ''This program has been around for a long time but I never believed in it. But one day when I received this again in the mail I decided to gamble my $25 on it. I followed the simple instructions and voila' - 3 weeks later the money started to come in. First month I only made $240.00 but the next 2 months after that I made a total of $290,000.00. So far, in the past 8 months by re-entering the program, I have made over $710,000.00 and I am playing it again. The key to success in this program is to follow the simple steps and NOT change anything'' More testimonials later but first, PRINT THIS NOW FOR YOUR FUTURE REFERENCE $$$ If you would like to make at least $500,000 every 4 to 5 months easily and comfortably, please read the following...THEN READ IT AGAIN and AGAIN!!! $$$ FOLLOW THE SIMPLE INSTRUCTION BELOW AND YOUR FINANCIAL DREAMS WILL COME TRUE, GUARANTEED! INSTRUCTIONS: Order all 5 reports shown on the list below. For each report, send $5 CASH, THE NAME NUMBER OF THE REPORT YOU ARE ORDERING and YOUR E-MAIL ADDRESS to the person whose name appears ON THAT LIST next to the report. MAKE SURE YOUR RETURN ADDRESS IS ON YOUR ENVELOPE TOP LEFT CORNER in case of any mail problems. When you place your order, make sure you order each of the 5 reports. You will need all 5 reports so that you can save them on your computer and resell them. YOUR TOTAL COST $5 X 5 = $25.00. You will receive, vie e-mail, each of the 5 reports from these 5 different individuals. Save them on your computer so they will be accessible for you to send to the 1,000's of people who will order them from you. Also make a floppy of these reports and keep it on your desk in case something happen to your computer. IMPORTANT __ DO NOT alter the names of the people who are listed next to each report, or their sequence on the list, in any way other than what is instructed below in step '' 1 through 6 '' or you will loose out on majority of your profits. Once you understand the way this works, you will also see how it does not work if you change it. Remember, this method has been tested, and if you alter, it will NOT work!!! People have tried to put their friends/relatives names on all five thinking they could get all the money. But it does not work this way. Believe us, we all have tried to be greedy and then nothing happened. So Do Not try to change anything other than what is instructed. Because if you do, it will not work for you. Remember, honesty reaps the reward!!! 1After you have ordered all 5 reports, take this advertisement and REMOVE the name address of the person in REPORT #5. This person has made it through the cycle and is no doubt counting their fortune. 2Move the name address in REPORT #4 down TO REPORT #5. 3Move the name address in REPORT #3 down TO REPORT #4. 4Move the name address in REPORT #2 down TO REPORT #3. 5Move the name address in REPORT #1 down TO REPORT #2 6Insert YOUR name address in the REPORT #1 Position. PLEASE MAKE SURE you copy every name address ACCURATELY! = Take this entire letter, with the modified list of names, and save it on your computer. DO NOT MAKE ANY
Re: Maintaining branches...
Mike Castle wrote: On Thu, Jun 14, 2001 at 03:26:31PM -0400, Derek R. Price wrote: Mike Castle wrote: And I think that this complete merging happens less than you might think. It cannot handle the situation where a specific set of changes is migrated before another (i.e., -j tag1 -j tag2). It may not even be off of an immediate branch, but rather a couple over. What can't it handle about this and why? Originally I was thinking only highwater marks. But I guess something like a .newsrc style range/set would work. (Ok, what IS that data structure properly called?) But consider the following sequence: branch at 1.1. Branch has 1.1.0.1 and 1.1.0.2. I'm going to pretend these are valid branch version numbers for the sake of argument. 1.1.0.3 is made, and that particular change is needed immediately on the branch branch, so only it is moved over. So 1.2 == 1.1 + 1.1.0.3. I'd probably call this 1.1 + 1.1.0.2-1.1.0.3. And it would really mean 1.1 + 1.1.0.2-1.1.0.3 + X, where X is some arbitrary set of changes (possibly null, possibly including conflict resolution). Assuming the ancestor won't always provide all the needed information. Changes 1.1.0.4 and 1.1.0.5 are made. Now we want to migrate all of those changes onto the main branch. So now we have to be able to tell cvs to: diff -r1.1 -r1.1.0.2, apply patch diff -r1.1.0.3 -r1.1.0.5, apply patch I thought the idea here was that you could say merge branch 1.1.0 and CVS would say, you already merged change A on DATE - (s)kip this portion or (r)emerge? Derek -- Derek Price CVS Solutions Architect ( http://CVSHome.org ) mailto:[EMAIL PROTECTED] CollabNet ( http://collab.net ) -- I will not bring sheep to class. I will not bring sheep to class. I will not bring sheep to class... - Bart Simpson on chalkboard, _The Simpsons_ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Maintaining branches...
On Thu, Jun 14, 2001 at 05:03:58PM -0400, Derek R. Price wrote: Mike Castle wrote: But consider the following sequence: branch at 1.1. Branch has 1.1.0.1 and 1.1.0.2. I'm going to pretend these are valid branch version numbers for the sake of argument. Thanks. Been a while since I've actually branched with CVS (stuck using perforce at work now). And since I never really pay attention to them, I always forget the numbering sequence it uses. Changes 1.1.0.4 and 1.1.0.5 are made. Now we want to migrate all of those changes onto the main branch. So now we have to be able to tell cvs to: diff -r1.1 -r1.1.0.2, apply patch diff -r1.1.0.3 -r1.1.0.5, apply patch I thought the idea here was that you could say merge branch 1.1.0 and CVS would say, you already merged change A on DATE - (s)kip this portion or (r)emerge? Sorry. I mean the -r1.1 -r1.1.0.2, apply patch, -r1.1.0.3, -r1.1.0.5, apply patch was a matter of implementation, not presentation. If the user chose skip, then I'd imagine it'd work like that. I assume the remerge stuff would come from when cvs determining what it needs to apply, rather than actually at application time. Patch, for instance, determines it at application time. What about merging back and forth. User makes change 1.1-1.2, and merges it onto branch, then it gets merged back. Users would normally expect cvs to track that information and act accordingly (ie, not present any conflicts based upon that particular bit). But, since you could have +X amount of changes between the up -j and the commit, you really can't do that. There will be conflicts. mrc -- Mike Castle [EMAIL PROTECTED] www.netcom.com/~dalgoda/ We are all of us living in the shadow of Manhattan. -- Watchmen fatal (You are in a maze of twisty compiler features, all different); -- gcc ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Moving the repository!!!
Hi, I am trying to move the repository(around 1.5GB) from one storage box(repository is on netapps server) to a different box. can you please share your experiences regarding this?. what precautions should take?. we are using some scripts for logging the information and these scripts are specified loginfo file of CVSROOT directory.we are using a separate directory for logging the information for each release and so on.. Thanks inadvance, Raghav, ThomsonThomson ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
testing different versions of client/server against each other
Tinkering around with my .trunk + .origin patch, I realized if it were ever to make it into mainstream CVS, there will inevitably be interaction between unpatched clients and patched servers and also between patched clients and unpatched servers. One would hope that they would behave reasonably well together, but right now the patch takes no special actions to determine if the other side of the connection is patched or unpatched. I think there might be some things that neither work nicely nor fail to work nicely if you attempt to use the new features and only one of the client/server pair is patched to handle it. (e.g. if you have an unpatched client, you can still get away with cvs co -r .trunk modulename, and various other things appear to work anyway) I don't know that _everything_ works right though. I was looking at sanity.sh to see if there was a way I could specify a different CVS for the server vs. the client. There's a CVS_SERVER variable, but in the TODO list at the end, it seems this is to be removed, and may have been partially removed already. So, two questions 1) Is there any easy way to get sanity.sh to test different versions of client and server against each other? (more to characterize the breakage than anything else) and 2) would it be a good idea for client and server to give each other some idea of what they can and cannot tolerate? For this latter, I suppose the simpler the better, maybe exchange version numbers and compare against a list of konwn-to-work-with (or maybe, known-not-to-work-with) and proceed or not based on that? How has this kind of thing been handled before? Or maybe it never came up? -- steve (the patch I refer to is here: http://www.geocities.com/dotslashstar/branch_patch.html ) __ Do You Yahoo!? Spot the hottest trends in music, movies, and more. http://buzz.yahoo.com/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
CVS slowness issues
I'm not entirely sure this is CVS-specific, but I can't get anything else to be as slow, so I'll ask here. We have an old Pentium set up running Linux for CVS only. It has two ISA ehternet cards in it -- one for the internal LAN, and another that sits on the internet. We use pserver to authenticate and access the repository, and it works like a dream -- *if* we access it through the LAN only. Through the other network card, it's unbearably slow. The network usage is wy low, and the route to the server through the internet is still only three jumps from here with a ping time under 10 ms. The machine seems completely idle in top, and cvs just sits there using a meg or two of memory and doing nothing. Sometimes it can finish a diff or an update in a few minutes on a 100k text file, but other times it never seems to finish. Other applications use the internet just fine, topping out our SDSL connection easily. So the hardware works. The network is not a bottleneck; neither are the processor or the memory capacity. Any ideas? We're using CVS 1.11.p1 as a server and WinCvs 1.2 (CVS 1.11) as a client. The box is running Caldera eServer 2.3 (kernel 2.2.14). Thanks in advance, Ryan ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: CVS tags
Tim Wensink wrote: Hello all, I have a question regarding CVS tags. I want to have a list of files that are in a certain release. Is there a command within (win)cvs that allows me to specifiy a certain tag and then generates a list of all the files that have that tag? Saw lots of responses to this with various options to cvs co... In the past, people have mentioned that cvs rdiff -s works well. cvs rdiff -s -r 0 -r some_tag some_module Gives you not just the filenames, but the revisions numbers too (Assumes you have no file with a revision of 0, which you don't most likely.) example: [scameron@zuul usrc]$ cvs rdiff -s -r 0 -r efs_x42_dev_br autobuild cvs server: Diffing efs/unix/autobuild File efs/unix/autobuild/autobuild is new; current revision 1.11.2.1 File efs/unix/autobuild/autobuild.html is new; current revision 1.4 File efs/unix/autobuild/build_warning is new; current revision 1.3 File efs/unix/autobuild/devel_list.txt is new; current revision 1.10.2.2 File efs/unix/autobuild/dist_list.txt is new; current revision 1.12.2.2 [...etc...] __ Do You Yahoo!? Spot the hottest trends in music, movies, and more. http://buzz.yahoo.com/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Maintaining branches...
--- Forwarded mail from [EMAIL PROTECTED] [ On Wednesday, June 13, 2001 at 23:12:16 (-0700), Paul Sander wrote: ] Subject: Re: Maintaining branches... Is there some reason why the -j's could not be recorded in the CVS directory, and corrected with each update? That's an intersting idea. It would certainly help me remember what I'm going in a given working directory, if nothing else! The joins shouldn't be recorded in the repository until the commits are done anyway. That's true! -j makes a notation in the CVS directory (or appends an existing one if multiple joins are done between commits), and -r and -A clear out the notations. At commit time, the notations could be recorded in the RCS files for future use. That's the trick. How do you do that without impacting RCS compatability??? Is doing it as part of the commit message sufficient? RCS has a standard method for extending the content of the RCS files, called the newphrase. (See the rcsfile(5) man page.) These things have both file-wide and version-wide scopes, and RCS ignores the ones it doesn't recognize. There should be no problem adding one or two newphrases to track merges. It might also be worthwhile to lobby the RCS developers (Paul Eggert?) to add a command line argument to the ci program to set such a paramter, and maybe also add arguments to the RCS program to add, query, and remove newphrases. --- End of forwarded message from [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Maintaining branches...
--- Forwarded mail from [EMAIL PROTECTED] On Thu, Jun 14, 2001 at 04:48:33PM -0700, Paul Sander wrote: --- Forwarded mail from [EMAIL PROTECTED] But consider the following sequence: branch at 1.1. Branch has 1.1.0.1 and 1.1.0.2. 1.1.0.3 is made, and that particular change is needed immediately on the branch branch, so only it is moved over. So 1.2 == 1.1 + 1.1.0.3. Changes 1.1.0.4 and 1.1.0.5 are made. Now we want to migrate all of those changes onto the main branch. I believe the desired behavior really is this: First merge: version 1.2 = version 1.1 + ( version 1.1.0.3 - version 1.1 ) Second merge: version 1.3 = version 1.2 + ( version 1.1.0.5 - version 1.1.0.3) Is this correct? That's what I thought at first, but now I believe he really does mean: First merge: version 1.2 = 1.1 + (1.1.0.3 - 1.1.0.2) commit trunk-only revs 1.3 and 1.4 Second merge: version 1.5 = 1.4 + (1.1.0.2 - 1.1) + (1.1.0.5 - 1.1.0.3) = 1.1 + (1.4 - 1.2 [sic]) + ( 1.1.0.5 - 1.1) And even if he doesn't mean that, it's a case that seems worth discussing. Say you have the familiar situation of Release-2 development on the trunk, and a Post-Release-1 bug-fix branch B. Someone fixes a bug on B. Then, before the team is ready to cope with a wholesale merge, it's discovered that that particular bug is a showstopper for continued trunk development. So you want to merge that bug fix only, but keep the rest of the fixes on B isolated until a later date. Your first case is really two merges, one requiring the user to supply version 1.1.0.3 as the common contributor. The other is a single join with version 1.1.0.2. You could also do this: version 1.5 = 1.4 + ( 1.1.0.5 - 1.1 ) And then resolve the inevitable conflicts resulting from the first bug-fix merge. This is how CVS currently works. --- End of forwarded message from [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
cvs: How to get last but one copy, from repository
Hi, Just i commited few changes in a project. changes are only in 3 files. Later i came to now that thae last version is the best rather than latest commit. So I want to delete the modifications done by last commit. How can i do it ? I have no exact idea, I think i can do bycvs update -p Can i get last nut one copy in a single cvs update. or i need to update once for one file. - KotiOff: 040 6513274 Extn: 8842When one door of happiness closes, another opens; but often we look so long at the closed door that we do not see the one, which has opened for us. - Hellen Keller.
Re: CVS - Obsolete files
Hi, what is diff between cvs rm and cvs delete? I am using cvs 1.10, I never heared about cvs rm. From which version cvs rm is available? Thanks, - Koti Off: 040 6513274 Extn: 8842 When one door of happiness closes, another opens; but often we look so long at the closed door that we do not see the one, which has opened for us. - Hellen Keller. - Original Message - From: Larry Jones [EMAIL PROTECTED] To: Lamar Seifuddin [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Sent: Friday, June 15, 2001 12:43 AM Subject: Re: CVS - Obsolete files Lamar Seifuddin writes: How can I set up CVS to checkout source directories without getting the obsolete files? Remove them (with cvs rm). They'll still be in the repository, just in the Attic subdirectory with the latest revision marked dead, so their revision history will still be available. -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 _ Do You Yahoo!? Get your free @yahoo.com address at http://mail.yahoo.com ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Maintaining branches...
On Thu, Jun 14, 2001 at 10:15:16PM -0700, Paul Sander wrote: Your first case is really two merges, one requiring the user to supply version 1.1.0.3 as the common contributor. The other is a single join with version 1.1.0.2. You could also do this: version 1.5 = 1.4 + ( 1.1.0.5 - 1.1 ) And then resolve the inevitable conflicts resulting from the first bug-fix merge. This is how CVS currently works. Two points: If I do that manually, I can easily avoid having to deal with a conflict by doing it in multiple stages. When I want to merge all the things in, I merge in the diff from 1.1 - 1.1.0.2. Then I apply the diff from 1.1.0.3 - current. Because I know I've already applied 1.1.0.3. If you're going to automate this, this is how I would expect the automation to work. mrc -- Mike Castle [EMAIL PROTECTED] www.netcom.com/~dalgoda/ We are all of us living in the shadow of Manhattan. -- Watchmen fatal (You are in a maze of twisty compiler features, all different); -- gcc ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
