cvs -q -z2
diff -uNp
#checkout -P
update -Pd