chiark
/
gitweb
/
~cjwatson
/
bin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pull-mail: add --force option; extend running times
[bin.git]
/
svn-takeover
diff --git
a/svn-takeover
b/svn-takeover
index f18c5418b515e17dc96e8501cc4adfc8cf86a035..bdde07f98ec2d73a20f1af91b917cdc280ca860a 100755
(executable)
--- 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
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
else
- echo "Not taking over $x; $1/$x/.svn missing or $x/.svn present." >&2
+ cp -a "$1/$x/.svn" "$x/"
fi
done
fi
done