--- trunk/test.sh 2007/11/02 11:49:09 46 +++ trunk/test.sh 2007/11/02 12:11:31 47 @@ -52,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 @@ -70,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 @@ -145,7 +145,7 @@ test svn rm $svn_co/dir/* || exit -svn revert $svn_co/dir/keep $svn_co/dir/keep-dir/keep +svn revert $svn_co/dir/keep $svn_co/dir/keep-dir{,/keep} svn commit -m "remove everything" $svn_co || exit test