Re: Newbie: problems adding directory to repository
Jesse Sheidlower [EMAIL PROTECTED] wrote in message news:[EMAIL PROTECTED]... There was a point at which I was making a lot of changes to my dev sandbox, but didn't have access to the repository so couldn't commit anything. When I got back to it, I found that I couldn't get some things to match up. The basic problem is that I had taken a specific program, and directory, called Book.pm and Book/ and then generalized it and renamed them to MyDatabase.pm and MyDatabase/ . In my dev CVS doesn't support renaming and moving. You want to be a Meta-CVS user! (Meta-CVS even has some support for detecting moves and renames that were done behind its back, so to speak, rather than using the ``mcvs mv'' command. The ``mcvs remap'' command will scan the directory tree, and based on the software's knowledge of the inode numbers of your files, it will uncover the moves. There are some limitations; if you move by copying, the inode identity is lost, and remap doesn't find moved symlinks. It's better to use the proper commands to rearrange the directory structure!) In Meta-CVS, directory structure rearrangements are just, effectively, like any other local edit. They can be done locally without being connected to the repository, and then committed when you regain access---and subject to merging and conflict resolution. In plain CVS, renaming is simulated by deleting files and adding them under new names. This must be done using the CVS commands ``rm'' and ``add''; CVS will not guess your intent from any direct filesystem rearrangements you have done. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Newbie: problems adding directory to repository
On Thu, Aug 14, 2003 at 04:01:45PM +0200, Julien Wajsberg wrote: You have to use cvs update -dP on your server sandbox to create new directories and delete empty one in a workign directory. I've tried this, and it doesn't work: - begin included text - gossypiboma~/cvs/library/modules $ ls CVS Field.pm FieldList.pm Session.pmWebDB.pm Field FieldList MyDatabase.pm WebDB gossypiboma~/cvs/library/modules $ cvs update -dP cvs update: Updating . cvs update: Updating Book cvs update: Updating Book/SearchDisplayView cvs update: Updating Field cvs update: Updating FieldList cvs update: Updating View cvs update: Updating WebDB gossypiboma~/cvs/library/modules $ ls CVS Field.pm FieldList.pm Session.pmWebDB.pm Field FieldList MyDatabase.pm WebDB gossypiboma~/cvs/library/modules $ - end included text - The old Book/ directories/files aren't added, but neither is the MyDatabase/ directory, which is what I'm trying to get. Jesse Sheidlower ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Newbie: problems adding directory to repository
I've recently started using CVS to help manage a programming project that I, and I alone, am working on, at least for now. I'm having a problem and couldn't find a solution in the docs or in the archives. My setup is that I have my CVS repository on my working server, and then a sandbox on my working server from which a build script puts things where they're supposed to go. Then on my development server, I again have a sandbox and a build script. I've been working by making changes in the sandbox on the dev sever, and when they're ready, committing them to the repository, updating the working server's sandbox, and building it out. There was a point at which I was making a lot of changes to my dev sandbox, but didn't have access to the repository so couldn't commit anything. When I got back to it, I found that I couldn't get some things to match up. The basic problem is that I had taken a specific program, and directory, called Book.pm and Book/ and then generalized it and renamed them to MyDatabase.pm and MyDatabase/ . In my dev sandbox, I have this directory called MyDatabase/ and there are a bunch of programs underneath it that used to be in Book/ . But I can't seem to get this directory onto the working server. When I go to the working sandbox and type cvs update, it doesn't create MyDirectory/ or anything underneath it; it's the same when I deleted the entire sandbox and did a cvs checkout from scratch. Yet in the development sandbox, it certainly thinks it's there-- when I type cvs add MyDatabase/ or cvs add [any of the programs under MyDatabase/] I get messages like there is a version in MyDatabase already or SearchView.pm already exists, with version number 1.3. What do I need to do to get these files out of CVS and into the sandbox on the working server? Thanks very much. Sorry if I'm missing something obvious. Jesse Sheidlower [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Newbie: problems adding directory to repository
You have to use cvs update -dP on your server sandbox to create new directories and delete empty one in a workign directory. For your other problem I don't know sorry :) -- Julien I've recently started using CVS to help manage a programming project that I, and I alone, am working on, at least for now. I'm having a problem and couldn't find a solution in the docs or in the archives. My setup is that I have my CVS repository on my working server, and then a sandbox on my working server from which a build script puts things where they're supposed to go. Then on my development server, I again have a sandbox and a build script. I've been working by making changes in the sandbox on the dev sever, and when they're ready, committing them to the repository, updating the working server's sandbox, and building it out. There was a point at which I was making a lot of changes to my dev sandbox, but didn't have access to the repository so couldn't commit anything. When I got back to it, I found that I couldn't get some things to match up. The basic problem is that I had taken a specific program, and directory, called Book.pm and Book/ and then generalized it and renamed them to MyDatabase.pm and MyDatabase/ . In my dev sandbox, I have this directory called MyDatabase/ and there are a bunch of programs underneath it that used to be in Book/ . But I can't seem to get this directory onto the working server. When I go to the working sandbox and type cvs update, it doesn't create MyDirectory/ or anything underneath it; it's the same when I deleted the entire sandbox and did a cvs checkout from scratch. Yet in the development sandbox, it certainly thinks it's there-- when I type cvs add MyDatabase/ or cvs add [any of the programs under MyDatabase/] I get messages like there is a version in MyDatabase already or SearchView.pm already exists, with version number 1.3. What do I need to do to get these files out of CVS and into the sandbox on the working server? Thanks very much. Sorry if I'm missing something obvious. Jesse Sheidlower [EMAIL PROTECTED] ___ 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: Newbie: problems adding directory to repository
Delete the CVS directory under MyDatabase in your local copy, re-add it and re-add the files under it, commit, and you should be fine. I just had this same problem. On Thu, 2003-08-14 at 16:55, Jesse Sheidlower wrote: I've recently started using CVS to help manage a programming project that I, and I alone, am working on, at least for now. I'm having a problem and couldn't find a solution in the docs or in the archives. My setup is that I have my CVS repository on my working server, and then a sandbox on my working server from which a build script puts things where they're supposed to go. Then on my development server, I again have a sandbox and a build script. I've been working by making changes in the sandbox on the dev sever, and when they're ready, committing them to the repository, updating the working server's sandbox, and building it out. There was a point at which I was making a lot of changes to my dev sandbox, but didn't have access to the repository so couldn't commit anything. When I got back to it, I found that I couldn't get some things to match up. The basic problem is that I had taken a specific program, and directory, called Book.pm and Book/ and then generalized it and renamed them to MyDatabase.pm and MyDatabase/ . In my dev sandbox, I have this directory called MyDatabase/ and there are a bunch of programs underneath it that used to be in Book/ . But I can't seem to get this directory onto the working server. When I go to the working sandbox and type cvs update, it doesn't create MyDirectory/ or anything underneath it; it's the same when I deleted the entire sandbox and did a cvs checkout from scratch. Yet in the development sandbox, it certainly thinks it's there-- when I type cvs add MyDatabase/ or cvs add [any of the programs under MyDatabase/] I get messages like there is a version in MyDatabase already or SearchView.pm already exists, with version number 1.3. What do I need to do to get these files out of CVS and into the sandbox on the working server? Thanks very much. Sorry if I'm missing something obvious. Jesse Sheidlower [EMAIL PROTECTED] ___ 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: Newbie: problems adding directory to repository
Jesse Sheidlower wrote: The basic problem is that I had taken a specific program, and directory, called Book.pm and Book/ and then generalized it and renamed them to MyDatabase.pm and MyDatabase/ . In my dev sandbox, I have this directory called MyDatabase/ and there are a bunch of programs underneath it that used to be in Book/ . But I can't seem to get this directory onto the working server. When I go to the working sandbox and type cvs update, it doesn't create MyDirectory/ or anything underneath it; it's the same when I deleted the entire sandbox and did a cvs checkout from scratch. Yet in the development sandbox, it certainly thinks it's there-- when I type cvs add MyDatabase/ or cvs add [any of the programs under MyDatabase/] I get messages like there is a version in MyDatabase already or SearchView.pm already exists, with version number 1.3. Renaming the directories (or files) locally is far from enough. It even should never be done. Check the CVS/Repository file and you should know that CVS never knows your local change (and how could it know? you did not inform it, did you?). It still thinks the files are in the MyDatabase directory (regardless of your local directory name). The simple rule is never to rename. If you are really uncomfortable, you should remove the old files/directories and re-add them. To do this smoothly, you may have to read the manual carefully and have an understanding how CVS works. You are your CVS admin. Best regards, Wu Yongwei ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
