cvs-repomove fixed for moving back to a place it's already been

diff --git a/debian/changelog b/debian/changelog
index ea673fdc0be1189a4ee3e172a5129ba01623fd56..5f8cf668d7724619cb4f6fce4e7f52779972247b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+chiark-utils (4.0.99.0.20) unstable; urgency=low
+
+  * cvs-repomove fixed for moving back to a place it's already been.
+
+ --
+
 chiark-utils (4.0.99.0.19) unstable; urgency=low
 
   * cvs-repomove fixed for resuming failed moves.

diff --git a/scripts/cvs-repomove b/scripts/cvs-repomove
index cc50c2579a9447668ebc77a3f4f7f8e3c70f0a4c..62f850ef6037c85ab5ea7d9e8888ec2aca64439e 100755 (executable)
--- a/scripts/cvs-repomove
+++ b/scripts/cvs-repomove
@@ -97,10 +97,10 @@ do_move () {
  set +e
  previously=\"$(ls -d -- $srcrepo/$module..moved-to-* 2>/dev/null)\"
  set -e
- if [ \"x$previously\" != x ]; then
-  echo \"    btw, module was once before moved away from here\"
-  mv -- \"$previously\" \
-   \"${previously/..moved-to-/..previously-\$(date +%s)-moved-to-}\"
+ if [ \"x\$previously\" != x ]; then
+  echo >&2 \"    btw, module was once before moved away from here\"
+  mv -- \"\$previously\" \
+   \"\${previously/..moved-to-/..previously-\$(date +%s)-moved-to-}\"
  fi
  echo \$resume
        '")"