Well this is how it happens: The folder on the client contains one directory (/media) that was checked out of CVS correctly, all subdirectories have CVS folders with correct Entries, Root, and Repository files. The CVS folder that is in the same folder as \media contains one line:
D/media//// The folder on the server has been updated and now has the /include and /src folders in addition to the /media folder. I do an update and I get all the "its in the way" errors for all the files in the /media folder. During this update a Entries.log file appears in the root CVS folder containing the following two lines: A D/include//// A D/src//// While the CVS/Entries file still has this line: D/media//// If I do another update I still get all the "it is in the way" errors but the Entries.log file dissapears and the Entries file is changed to this: D/include//// D/src//// With the media folder having dissapeared from the Entries file. Any idea why this would be happening? Thanks, Jason A. ----- Original Message ----- From: "Larry Jones" <[EMAIL PROTECTED]> To: "Jason Allen" <[EMAIL PROTECTED]> Cc: <[EMAIL PROTECTED]>; <[EMAIL PROTECTED]> Sent: Tuesday, January 29, 2002 9:41 AM Subject: Re: "it is in the way" problem > Jason Allen writes: > > > > I've narrow it down and it looks like this is the problem. There is a > > directory that was added later and isn't in the working copy, when I do the > > update I get all the "it is in the way" errors, everytime. If I manually add > > the directory to the CVS\Entries file, it works fine. > > That implies that the directory *is* in the working copy, but that it > didn't come from CVS. Perhaps someone copied the directory and files > from somewhere else directly because they didn't know how to get it from > CVS (you have to use update -d to create new directories). Once you've > gotten yourself into such a mess, about the only thing you can do is to > rename the directory, do an update -d to get it from CVS, diff all the > files and manually merge any changes, then delete the original non-CVS > directory (and commit any changes you made in the new directory, if > desired). > > -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 _________________________________________________________ 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
