Quickies for CVS

---

General

• Changing a file to -kb after it's been added [permalink]
  % cvs admin -kb filename

• Checking .nib and .pbproj files into CVS [permalink]
  You'll need to use the cvswrappers file provided in the devtools. The easiest thing to do is to copy it to your homedir and prepend a dot:

  % cp /Developer/Tools/cvswrappers ~/.cvswrappers

  You can also add the contents of that fike to your repository.

  .pbproj files aren't handled by the cvswrappers by default. You'll need to add a line like this:

  *.pbproj -k 'b' -f '/Developer/Tools/cvs-unwrap %s' -t '/Developer/Tools/cvs-wrap %s %s' -m 'COPY'

• Dealing with the past [permalink]
  To check out the world as it was 3 days ago:

  % cvs checkout -D "3 days ago" blork

  Or via a date (month/day/year)

  % cvs checkout -D "10/17/2002" fnord

  or recently in time

  % cvs diff -D "1 hour ago" ook.blah

• Getting cvs update to build new directories [permalink]
  % cvs update -d [whatever]

• Merging a Branch with new directories in CVS [permalink]
  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)

• Recursively adding directories [permalink]
  To recursively add stuff in CVS:

  % find . -type d -print | grep -v CVS | xargs cvs add
  % find . -type f -print | grep -v CVS | xargs cvs add
  

  The first adds the directories, the second adds the files. Filenames with spaces in them won't be added, and it won't do the Right Thing with -kb for binary files.

• Showing the log comments between a set of revisions [permalink]
  % cvs log -r1.2:1.5 multiprocessing.txt

---