rdiff -up
diff -up
update -dP -I ! -I CVS
import -I !