Gerald Combs wrote:
On Mon, 10 Nov 2003, Jeff Morriss wrote:
Every time I forget to do a "make distclean" before "cvs update", CVS
tells me that "wiretap/Makefile" is in the way and to move it away.
Also, if I diff the whole wiretap directory, it diffs the Makefile as
well as the files that have actually changed.
Any reason why? (I suppose there is; I guess the real question is can
it be fixed?)
Also note that the file does not show up in the list when I go in
through ViewCVS:
http://www.ethereal.com/cgi-bin/viewcvs.cgi/ethereal/wiretap/
wiretap/Makefile used to be in CVS. It was deleted a while back and now
resides in the "Attic." If you open up wiretap/CVS/Entries with a text
editor, is Makefile listed? If so you might try deleting that line
(although you may want to create a backup copy of the Entries file first).
It is in "wiretap/CVS/Entries". I deleted the line but "cvs update"
still complains:
martini [~/ethereal-dev/source/wiretap/]> cvs update -Pd -r HEAD
cvs server: Updating .
cvs update: move away ./Makefile; it is in the way
C Makefile
If I remove the line and the file, CVS pulls down the file and puts the
entry back in "Entries":
martini [~/ethereal-dev/source/wiretap/]> grep /Makefile/ CVS/Entries
martini [~/ethereal-dev/source/wiretap/]> rm Makefile
martini [~/ethereal-dev/source/wiretap/]> cvs update -Pd -r HEAD
cvs server: Updating .
U Makefile
M libpcap.c
M wtap.h
martini [~/ethereal-dev/source/wiretap/]> grep /Makefile/ CVS/Entries
/Makefile/1.13/Thu May 9 23:50:34 2002//THEAD
martini [~/ethereal-dev/source/wiretap/]>
