--- trunk/test.sh	2007/09/07 10:08:52	32
+++ trunk/test.sh	2007/11/02 12:11:31	47
@@ -1,9 +1,12 @@
 #!/bin/sh -x
 
-svn_rep=`pwd`/test-svn-rep/
-svn_co=`pwd`/test-svn-co/
-cvs_rep=`pwd`/test-cvs-rep/
-cvs_co=`pwd`/test-cvs-co/
+dir=/dev/shm
+test -e $dir || dir=/tmp/
+
+svn_rep=$dir/test-svn-rep/
+svn_co=$dir/test-svn-co/
+cvs_rep=$dir/test-cvs-rep/
+cvs_co=$dir/test-cvs-co/
 
 test -d $svn_rep && rm -Rf $svn_rep
 test -d $svn_co && rm -Rf $svn_co
@@ -49,13 +52,13 @@
 
 rm -Rf $cvs_co || exit
 mkdir $cvs_co || exit
-cd $cvs_co && cvs -f co dir && cd - || exit
+cd $cvs_co && cvs -f co -P dir && cd - || 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
+	cd $cvs_co && cvs -f update -P -d dir && cd - || exit
 }
 function update_svn() {
 	svn update $svn_co || exit
@@ -67,7 +70,7 @@
 function test() {
 	svn2cvs
 	update_all
-	diff -x .svn* -x CVS -urw $svn_co/dir/ $cvs_co/dir/ || exit
+	diff -x .svn\* -x CVS -x '\.keepme' -urw $svn_co/dir/ $cvs_co/dir/ || exit
 }
 
 svn2cvs
@@ -87,11 +90,11 @@
 test
 
 echo "new file" > $svn_co/dir/skip_add
-svn add $svn_co/dir/skip_add || exit;
-svn commit -m "add skip_add" $svn_co || exit;
+svn add $svn_co/dir/skip_add || exit
+svn commit -m "add skip_add" $svn_co || exit
 
 echo "modify file" >> $svn_co/dir/skip_add
-svn commit -m "modify skip_add" $svn_co || exit;
+svn commit -m "modify skip_add" $svn_co || exit
 
 cvs_rev=`cat $cvs_co/dir/.svnrev`
 echo "*** skipping revision $cvs_rev ***"
@@ -100,3 +103,49 @@
 
 test
 
+echo keep > $svn_co/dir/keep
+svn add $svn_co/dir/keep
+svn mkdir $svn_co/dir/keep-dir
+echo keep > $svn_co/dir/keep-dir/keep
+svn add $svn_co/dir/keep-dir/keep
+svn commit -m "stuff to keep" $svn_co || exit
+
+test
+
+svn rm $svn_co/dir/keep-dir/keep
+svn commit -m "remove keep in keep-dir" $svn_co || exit
+
+test
+
+svn mv $svn_co/dir/keep $svn_co/dir/keep-dir/ || exit
+svn commit -m "move keep into keep-dir" $svn_co || exit
+
+test
+
+svn mv $svn_co/dir/keep-dir/keep $svn_co/dir/keep || exit
+svn commit -m "move keep back" $svn_co || exit
+
+test
+
+echo bar > $svn_co/dir/bar
+echo baz > $svn_co/dir/baz
+svn mkdir  $svn_co/dir/l1
+echo bar > $svn_co/dir/l1/bar
+echo baz > $svn_co/dir/l1/baz
+svn mkdir  $svn_co/dir/l1/l2
+echo bar > $svn_co/dir/l1/l2/bar
+echo baz > $svn_co/dir/l1/l2/baz
+svn mkdir  $svn_co/dir/l1/l2/l3
+echo bar > $svn_co/dir/l1/l2/l3/bar
+echo baz > $svn_co/dir/l1/l2/l3/baz
+
+svn add $svn_co/dir/* $svn_co/dir/l1 $svn_co/dir/l1/* $svn_co/dir/l1/l2/* $svn_co/dir/l1/l2/l3/*
+svn commit -m "add a bunch of stuff" $svn_co || exit
+
+test
+
+svn rm $svn_co/dir/* || exit
+svn revert $svn_co/dir/keep $svn_co/dir/keep-dir{,/keep}
+svn commit -m "remove everything" $svn_co || exit
+
+test