I'm no cvs expert, but don't you want to merge the head to the tiger branch, verify that everything still works, then merge tiger back to the head and make the tiger branch obsolete?