cvs -q -z3
diff -u
update -dP