--- trunk/test.sh	2007/09/05 20:39:29	31
+++ trunk/test.sh	2007/09/07 10:08:52	32
@@ -51,31 +51,40 @@
 mkdir $cvs_co || exit
 cd $cvs_co && cvs -f co dir && cd - || exit
 
-./svn2cvs.pl file://$svn_rep/dir $cvs_rep dir || exit
+function svn2cvs() {
+	./svn2cvs.pl file://$svn_rep/dir $cvs_rep dir || exit
+}
+function update_cvs() {
+	cd $cvs_co && cvs -f update -d dir && cd - || exit
+}
+function update_svn() {
+	svn update $svn_co || exit
+}
+function update_all() {
+	update_svn
+	update_cvs
+}
+function test() {
+	svn2cvs
+	update_all
+	diff -x .svn* -x CVS -urw $svn_co/dir/ $cvs_co/dir/ || exit
+}
+
+svn2cvs
+update_cvs
 
-cd $cvs_co && cvs -f up -d && cd - || exit
 test -d "$cvs_co/dir/with space" || exit
 
 ps ax > $svn_co/dir/file || exit
 svn add $svn_co/dir/file || exit
 svn commit -m "file again" $svn_co || exit
 
-./svn2cvs.pl file://$svn_rep/dir $cvs_rep dir || exit
-
-svn update $svn_co || exit
-cd $cvs_co && cvs -f update -d dir && cd - || exit
-
-diff -x .svn* -x CVS -urw $svn_co/dir/ $cvs_co/dir/ || exit
+test
 
 svn rm $svn_co/dir/file || exit
 svn commit -m "remove file again" $svn_co || exit
 
-./svn2cvs.pl file://$svn_rep/dir $cvs_rep dir || exit
-
-svn update $svn_co || exit
-cd $cvs_co && cvs -f update -d dir && cd - || exit
-
-diff -x .svn* -x CVS -urw $svn_co/dir/ $cvs_co/dir/ || exit
+test
 
 echo "new file" > $svn_co/dir/skip_add
 svn add $svn_co/dir/skip_add || exit;
@@ -89,10 +98,5 @@
 echo `expr $cvs_rev + 1` > $cvs_co/dir/.svnrev || exit
 cd $cvs_co && cvs -f commit -m "skip $cvs_rev" dir/.svnrev && cd - || exit
 
-./svn2cvs.pl file://$svn_rep/dir $cvs_rep dir || exit
-
-svn update $svn_co || exit
-cd $cvs_co && cvs -f update -d dir && cd - || exit
-
-diff -x .svn* -x CVS -urw $svn_co/dir/ $cvs_co/dir/ || exit
+test