[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: "it is in the way" problem

From: Larry Jones
Subject: Re: "it is in the way" problem
Date: Tue, 29 Jan 2002 10:41:14 -0500 (EST)

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

-Larry Jones

I won't eat any cereal that doesn't turn the milk purple. -- Calvin

reply via email to

[Prev in Thread] Current Thread [Next in Thread]