Once a directory has been removed using cvs remove <dir> and cvs commit, is there an easy way to undo the change - to restore the directory in my working copy and in the repository? So far I've only been able to find suggestions which would help if I hadn't done the commit yet, or if it were a file instead of a directory. If possible, I'd like to preserve the history of the directory's contents.
(Answering my own question as I figured it out.)
To restore a deleted directory after the delete has been committed:
cvs update -d -R -j <rev2> -j <rev1> <dir>
Where:
<rev2> is the revision which resulted from committing the remove.
<rev1> is the revision immediately before rev2.
<dir> is the deleted directory.