When merging a branch back into the trunk (using the update command) be sure to use the
-doption. Otherwise CVS will just ignore any directories added in the branch.
% cvs update -Ad #switch to the trunk (if you haven't already) % cvs update -d -j branch_name [resolve conflicts] % cvs commit -m "whatever"
(Courtesy of Jeremy Stein)