geese-chasing bugfix from liberator; move ..moved-to-* thing away in destination

diff --git a/debian/changelog b/debian/changelog
index ab0a4db871c970a329a9866f28c7729d9d5c78fc..47c0c6ba3acee683195a018efbd37ca801c87a93 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 chiark-utils (4.0.99.0.20) unstable; urgency=low
 
   * cvs-repomove fixed for moving back to a place it's already been.
+  * cvs-repomove geese-chasing bugfix.
   * Typo in copyright statement in with-lock-ex.1 fixed.
 
  --

diff --git a/scripts/cvs-repomove b/scripts/cvs-repomove
index 62f850ef6037c85ab5ea7d9e8888ec2aca64439e..92e1765bc371f56197ae617cbf681ce9f4d563aa 100755 (executable)
--- a/scripts/cvs-repomove
+++ b/scripts/cvs-repomove
@@ -115,11 +115,21 @@ do_move () {
  fi
  for f in $module..*; do
   case \"\$f\" in
-  *..moved-to-*)   echo \"    btw, module was previously at destn repo\" ;;
+  *..moved-to-*)
+   echo \"    btw, module was previously at destn repo\"
+   mv -- \"\$f\" \
+    \"\${f/..moved-to-/..previously-\$(date +%s)-moved-to-}\"
+   ;;
   *..previously-*) ;;
-  *..tmp-*)       echo \"    nb: possibly-stale temp/partial copy \$f\" ;;
-  *..\*)          ;;
-  *)              echo >&2 \"error: found unexpected subdir \$f\"; exit 8;;
+  *..tmp-*)
+   echo \"    nb: possibly-stale temp/partial copy \$f\"
+   ;;
+  *..\*)
+   ;;
+  *)
+   echo >&2 \"error: found unexpected subdir \$f\"
+   exit 8
+   ;;
   esac
  done
        '"
@@ -176,7 +186,7 @@ do_furtle () {
                        remotehost="${goose%%:*}"
                        path="${goose#*:}"
                        check_hostname "$remotehost"
-                       check_remote_path "$remotepath/$module"
+                       check_remote_path "$path/$module"
                        isremote=true
                        compute_fqdn_data "$remotehost"
                        if [ "x$fqdn_data" = "x$our_fqdn_data" -a \