projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
seems to be complaining about something...
[feisty_meow.git]
/
scripts
/
rev_control
/
svn_rm_dupes.sh
diff --git
a/scripts/rev_control/svn_rm_dupes.sh
b/scripts/rev_control/svn_rm_dupes.sh
index 404ad073be4aaf19e1c9cc18a7ee7b622d8530f0..70448ddedba832ab2bb0ceb8be63454f52234f37 100644
(file)
--- a/
scripts/rev_control/svn_rm_dupes.sh
+++ b/
scripts/rev_control/svn_rm_dupes.sh
@@
-7,6
+7,8
@@
exemplar_dir="$1"; shift
whack_dir="$1"; shift
exemplar_dir="$1"; shift
whack_dir="$1"; shift
+#hmmm: much code here is shared with whack_dupes. get into a library.
+
# make sure they gave us a good directory to start with.
if [ -z "$exemplar_dir" ]; then
echo "whack_dupes"
# make sure they gave us a good directory to start with.
if [ -z "$exemplar_dir" ]; then
echo "whack_dupes"
@@
-44,6
+46,12
@@
if [ ! -z "$whack_dir" ]; then
pushd "$whack_dir" &>/dev/null
fi
pushd "$whack_dir" &>/dev/null
fi
+# now that we're in the directory to clean, make sure we're good there.
+if [ ! -d ".svn" ]; then
+# echo "Could not find a subversion directory; operation would be pointless."
+ exit 0
+fi
+
current_dir="$(pwd)"
#echo "currdir=$current_dir gooddir=$the_good_place"
current_dir="$(pwd)"
#echo "currdir=$current_dir gooddir=$the_good_place"
@@
-54,11
+62,6
@@
if [ "$current_dir" == "$the_good_place" ]; then
exit 4
fi
exit 4
fi
-if [ ! -d ".svn" ]; then
- echo "Could not find a subversion directory; operation would be pointless."
- exit 1
-fi
-
# do the real work now...
for i in *; do
if [ -f "$exemplar_dir/$i" ]; then
# do the real work now...
for i in *; do
if [ -f "$exemplar_dir/$i" ]; then