X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=svn-takeover;h=bdde07f98ec2d73a20f1af91b917cdc280ca860a;hp=0f0315b4e19d50f250ee42978c43f6484f81ab82;hb=e470a222375a6f1b03b3bb72d9b2b994da8de8bb;hpb=0048d35c0858966638d7803aa9080421032f9aee

diff --git a/svn-takeover b/svn-takeover
index 0f0315b..bdde07f 100755
--- a/svn-takeover
+++ b/svn-takeover
@@ -6,11 +6,13 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
-for x in `find . -type d`; do
-    if [ -d "$1/$x/.svn" ] && [ ! -d "$x/.svn" ]; then
-	cp -a "$1/$x/.svn" "$x/"
+for x in `find . -name .svn -prune -o -type d -print`; do
+    if [ ! -d "$1/$x/.svn" ]; then
+	echo "Not taking over $x; $1/$x/.svn missing." >&2
+    elif [ -d "$x/.svn" ]; then
+	echo "Not taking over $x; $x/.svn present." >&2
     else
-	echo "Not taking over $x; $1/$x/.svn missing or $x/.svn present." >&2
+	cp -a "$1/$x/.svn" "$x/"
     fi
 done