ready to commit DAMAGE-XFIXES merge

[Stuart Kreitman]

I have the server linked. Ready to start committing. Have followed 
directions in  http://freedesktop.org/XOrg/CvsPage.
but am getting stymied on populating new directories:

colnago% pwd   
/net/colnago/export/home/stukreit/X/HEAD/xc/programs/Xserver/miext
colnago% cvs add damage
cvs [add aborted]: there is a version in damage already

       --yes, this is because I flubbed the branch tags 3 months ago
colnago% cd damage
colnago% cvs add Imakefile
cvs add: cannot add file on non-branch tag `HEAD'
            --its mad at me because this file is in /Attic

need some guidance to proceed.

skk