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
