VSS to CVS
- Original Message - From: ujjwal To: [EMAIL PROTECTED] Sent: Monday, December 02, 2002 3:31 PM Subject: VSS to CVS HI, I want to shift from VSS to CVS.As far as code is concerned i can import the directory structure directly. But the thing which is bothering me is the history. I need to maintain the history of the files in the VSS. So plz let me know whether there is any migration tool avaiable which can conert the VSS files to the CVS along which the history in the current VSS. Thanks in Advance, Ujjwal
Re: CVS hangs on exit when using SSH
Larry - I've seen you saying 'this is fixed in the development version of cvs' a bunch recently. Perhaps we should think about rolling a new release? donald On Mon, Dec 02, 2002 at 01:34:19AM -0500, Larry Jones wrote: Ken Williams writes: When I issue any CVS command (update, checkout, diff, etc.), the connection hangs indefinitely when the command is [nearly?] completed. It happens reliably on this client, but never happens on another client with identical software versions. There is a known incompatibility between the 1.11.2 server and all previous clients when compression is enabled. This is fixed in the current development version of CVS. -Larry Jones Yep, we'd probably be dead by now if it wasn't for Twinkies. -- Calvin ___ 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
Merging on Vendor releases
Hi, I am fairly new to CVS, and need to do a not so trivial task with it. I've read all the Documentation I found (Namley the cederquist Online Manual, the FAQ, and a fair amount of the Mailinglist Archive), and tested some things, but am still a bit lost. Here is what I want to do: I have a CVS repository, with a initial vendor release import. From this base there were quite some local modifications to the code, which I like to port to the new release of the vendor, one at a time (We have several tags in our local repository). Using CVS's import feature leaves me with a huge amount of conflicting merges (the vendor project is quite large) and as far as I understand would commit all our modifications at once.(Which would make the resulting code quite undebuggable) What I like to do is porting one local change at a time e.g. I have the following tags VendorRelease basicChanges extension1 extension2 product I'd like to take the new Vendor version and first apply the basicChanges, then test and debug the whole mess, and then go on with extension1 and so on. Now my question is this possible in cvs (I guess so)? If so how do I do it (From what I figured the solution lies somwhere in branching and diffing)? Are there any tools which could assist me? TIA Fabio Fracassi ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: VSS to CVS
There is a perl script called vss2cvs.pl I don't know where to find it, but you can search at google. Zandao. -Original Message- From: ujjwal [mailto:[EMAIL PROTECTED]] Sent: Monday, December 02, 2002 7:15 AM To: [EMAIL PROTECTED] Subject: VSS to CVS HI, I want to shift from VSS to CVS.As far as code is concerned i can import the directory structure directly. But the thing which is bothering me is the history. I need to maintain the history of the files in the VSS. So plz let me know whether there is any migration tool avaiable which can conert the VSS files to the CVS along which the history in the current VSS. Thanks in Advance, Ujjwal ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Merging on Vendor releases
On Mon, Dec 02, 2002 at 07:03:36PM +0100, Fabio Fracassi wrote: What I like to do is porting one local change at a time e.g. I have the following tags VendorRelease basicChanges extension1 extension2 product I'd like to take the new Vendor version and first apply the basicChanges, then test and debug the whole mess, and then go on with extension1 and so on. This is indeed a complicated operation. I have not attempted this myself, and I believe you should consider doing the merge in a signle step, but then again it depends on the complexity of the local changes. If you still want to do a piecemeal merge you should go like this, but *do* take my words with a grain of salt! First create a branch rooted at basicChanges, like this: cvs rtag -b -r basicChanges b_basicChanges Then checkout from this branch: cvs co -r b_basicChanges Then merge the vendor changes in it: cvs update -j VendorRelease -j VendorRelease_new Fix the conflicts, test and make sure everything works fine. Then commit in the branch: cvs commit Then merge in the branch the extension1 changes: cvs update -j basicChanges -j extension1 Again resolve the conflicts, and commit. cvs commit Finaly merge the extension2 changes: cvs update -j extension1 -j enxtension2 Resolve the conflics and commit for the final time. /npat -- default, n.: The vain attempt to avoid errors by inactivity. -- Stan Kelly-Bootle ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Inter-dependent modules
Just to clarify (not contradict) what a couple of people said: On Sun, Dec 01, 2002 at 08:27:53PM -0800, Wayne Johnson wrote: You set up a module alias. If you have module A and B, both of which use module C, you can define a module X with contains modules A and C, and Y which includes B and C. X -a A C Y -a B C That only works if A, B, and C are all different directories. Each sandbox directory must be backed by exactly one repository directory. If you think about the contents of the CVS/Repository files, you'll see why this must be the case. But the tree hierarchies and names need not correspond. You can have sandbox-directory X contain only some of the files from repo-directory A. CVSROOT/modules can help you to semi-automate both of those things. The only thing you can't do is mix together *files* from more than one repo directory. That is, you can do this: Sandbox Repo X/* A/* X/C/* blah/common/* Or this: X/* A/* X/C/foo.js blah/common/foo.js (not present) blah/common/bar.js but not this: X/foo.jsA/foo.js X/bar.jsblah/common/bar.js On Mon, Dec 02, 2002 at 01:32:12AM -0500, Larry Jones wrote: Symbolic links to directories mostly work, although you may run into strange problems with some CVS commands. Symbolic links to files subvert the CVS locking mechanism and thus should never be used under any conditions. This refers to putting symlinks within the repo, or naming a symlink in $CVSROOT. Symlinks in sandboxes don't break, exactly -- but CVS pretty much ignores them, so you have to use some other tool, e.g. make, to maintain them. -- | | /\ |-_|/ Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / Just Say No to the faceless cannonfodder stereotype. - http://www.ainurin.net/ (an Orc site) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: anyone got a copy of vss2cvs.pl?
I don't have the original version, but I can give you my version - it has some modifications handle: - directory recursion - ignore certain extensions - ignore binary files - import shared files once - this is a big time saver, though you'll have to work with your CVS repository directly after the fact to deal with where the shared files ended up and all the files that point to them. This is the kind of thing you have to do anyway when importing VSS repositories to CVS - change author names in massage step Most of these changes are explained in the file vss2cvs.pl. Let me know if you have questions. Files: README.txt - original readme listshares.pl - original share listing utility vss2cvs.pl - my modified import script massagecomments.pl - original post processing script mymassagecomments.pl - my version of above - does author mangling findauthors.pl - my utility to find author names countrevisions.pl - my import stats utility On Wed, Nov 27, 2002 at 16:28:24 -0500, James Manning sent 0.5K bytes: I'm trying to track down a copy of the vss2cvs perl script. It normally lived at http://www.laine.org:8080/cvs/vss2cvs/ but that server has been dead for at least a couple weeks now, so I'm asking around to see if anyone has a copy. Thanks! James -- James Manning http://www.sublogic.com/james/ GPG Key fingerprint = B913 2FBD 14A9 CE18 B2B7 9C8E A0BF B026 EEBB F6E4 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs -- The cutting edge is getting rather dull. -- Andy Purshottam vss2cvs.tar.gz Description: GNU Zip compressed data
using .cvsrc in client-server setup
Hi I want to know if the options we specify in the .cvsrc file has effect in a client-server environment i.e. if I give checkout -P in the .cvsrc of the server, will it be applied to a checkout from a remote client? Thanks, Jeeva Sarma __ Do you Yahoo!? Yahoo! Mail Plus - Powerful. Affordable. Sign up now. http://mailplus.yahoo.com ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: using .cvsrc in client-server setup
Jeeva Sarma writes: I want to know if the options we specify in the .cvsrc file has effect in a client-server environment i.e. if I give checkout -P in the .cvsrc of the server, will it be applied to a checkout from a remote client? Yes, .cvsrc has an effect in client/server mode, but it's the .cvsrc on the *client*. The .cvsrc on the server, if any, should be ignored. -Larry Jones All this was funny until she did the same thing to me. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: using .cvsrc in client-server setup
--- Larry Jones [EMAIL PROTECTED] wrote: Jeeva Sarma writes: I want to know if the options we specify in the .cvsrc file has effect in a client-server environment i.e. if I give checkout -P in the .cvsrc of the server, will it be applied to a checkout from a remote client? Yes, .cvsrc has an effect in client/server mode, but it's the .cvsrc on the *client*. The .cvsrc on the server, if any, should be ignored. -Larry Jones All this was funny until she did the same thing to me. -- Calvin Hi How do I set this for a windows98 client?(command line) Where should I have this file? Thanks, Jeeva Sarma __ Do you Yahoo!? Yahoo! Mail Plus - Powerful. Affordable. Sign up now. http://mailplus.yahoo.com ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs