info-cvs
[Top][All Lists]
Advanced

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

Re: move away <file>, it is in the way


From: Mike Castle
Subject: Re: move away <file>, it is in the way
Date: Tue, 22 May 2001 13:24:35 -0700
User-agent: Mutt/1.3.18i

On Tue, May 22, 2001 at 09:34:27PM +0200, Nils Holland wrote:
> Someone suggested that I re-checkout the sources as described above. Then, I 
> should cd directly to /usr/src/kde-cvs/koffice and do a "cvs upd" there. This 
> has worked - the above error message did not appear, and some files were 
> properly updated. Still, I couldn't find any information about this "move 
> away..." error message. If anyone on this mailing list can explain it to me 
> and tell me why it initially occured and what I can do to prevent it from 
> occuring again, I'd be very happy.


Imagine the situation where there was a .y (yacc) file in the respository.
You run yacc and get a .c file.  Now someone adds the .c file to the
archive (maybe not everyone has yacc).  You do an update, and now the .c
file that you created is in the way of the new one added to the repository.

Ok, that's the situation that this is designed to cover.

However, if you notice in your CVS/ directory, you'll have a file called
Entries that has lines like the following:

/ANNOUNCE/1.48/Wed May  2 00:43:50 2001//D2001.11.03.08.00.00
/AUTHORS/1.12/Wed May 24 15:54:06 2000//D2001.11.03.08.00.00

(wine in this case, if anyone cares).

Now, if one of those lines was missing or corrupted some how, then cvs
would think that you didn't download the file from cvs but generated it
yourself, and it doesn't want to overwrite it.

Somehow, most likely, your CVS/Entries file got corrupted.

If this happens again, could you save off your CVS/* files and analyze
them.  Maybe something flaky happen (something stomped on them, ran out of
disk space, hit control-\ at just the right time while cvs was running, cvs
died on it's own).  If necessary, maybe post them to the list.

Meanwhile, if it's only a handful of files, you can manually delete the
files that are in the way, and do "cvs up" again and that should be
sufficient.  If it's a lot of files, it will probably be easier to rm -rf
the heirarchy and from the top level to a "cvs up -Pd".

mrc
-- 
       Mike Castle       Life is like a clock:  You can work constantly
  address@hidden  and be right all the time, or not work at all
www.netcom.com/~dalgoda/ and be right at least twice a day.  -- mrc
    We are all of us living in the shadow of Manhattan.  -- Watchmen



reply via email to

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