X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=svn-takeover;h=bdde07f98ec2d73a20f1af91b917cdc280ca860a;hp=f18c5418b515e17dc96e8501cc4adfc8cf86a035;hb=d2464a0fc4345255c35e7d5379edaa6806e7e93b;hpb=2b16cbcadb0dff723626cb91f6800135e245bac2

diff --git a/svn-takeover b/svn-takeover
index f18c541..bdde07f 100755
--- a/svn-takeover
+++ b/svn-takeover
@@ -7,10 +7,12 @@ if [ -z "$1" ]; then
 fi
 
 for x in `find . -name .svn -prune -o -type d -print`; do
-    if [ -d "$1/$x/.svn" ] && [ ! -d "$x/.svn" ]; then
-	cp -a "$1/$x/.svn" "$x/"
+    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