One Quickie

Merging a Branch with new directories in CVS (CVS->General)
When merging a branch back into the trunk (using the update command) be sure to use the -d option. 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)

borkware home | products | miniblog | rants | quickies | cocoaheads
Advanced Mac OS X Programming book