Date: Sat, 07 Dec 2002 12:48:48 -0800 (PST) From: John Polstra <jdp@polstra.com> To: current@freebsd.org Cc: stable@freebsd.org Subject: CVSup vs. src/contrib/gcc/INSTALL: the fix Message-ID: <XFMail.20021207124848.jdp@polstra.com>
next in thread | raw e-mail | index | archive | help
Some of you who use CVSup in checkout mode to update our source
trees have reported problems with "src/contrib/gcc/INSTALL" that
look like this:
> Delete src/contrib/gcc/INSTALL
> Cannot delete "/usr/src/contrib/gcc/INSTALL": Directory not empty
This was apparently caused by a recent gcc import which changed the
regular file INSTALL into a directory. Unfortunately, CVSup doesn't
handle that kind of change very well in checkout mode.
To recover, you will need to do the following:
- Remove the offending file(s) with "rm -rf /usr/src/contrib/gcc/INSTALL".
- Find the checkouts file for your collection. If you use a
standard supfile from "/usr/share/examples/cvsup", it will have a
name which matches "/usr/sup/src-all/checkouts.cvs:*". If you use
a custom supfile, then read cvsup(1) and your supfile and figure
out for yourself where the checkouts file is. In the man page it
is referred to as the "list" file. If you cannot find it, please
switch back to Windows -- you'll be happier there. ;-)
- Edit the checkouts file you found in the previous step with a text
editor. You will see that there is one line per file, and that
the lines are in alphabetical order by filename. Find the entries
for "src/contrib/gcc/INSTALL", which will most likely look
something like this:
D src/contrib/gcc/INSTALL
[... a bunch of lines for files under src/contrib/gcc/INSTALL]
U src/contrib/gcc/INSTALL 2#861#11#01#0
c src/contrib/gcc/INSTALL,v . . 2#871#110#10339284636#1127343#444
Delete all of those lines from the file.
- Run your usual CVSup update, but DO NOT USE THE -s OPTION on the
command line.
After that, the problem should be fixed.
Please remove me from the cc if you reply to this message.
John
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?XFMail.20021207124848.jdp>