cvs -z3
diff -Nu
update -Pd
checkout -P