From: ianmdlvl <ianmdlvl>
Date: Wed, 15 Feb 2006 19:55:32 +0000 (+0000)
Subject: geese-chasing bugfix from liberator; move ..moved-to-* thing away in destination
X-Git-Tag: debian_version_4_0_99_0_20~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=83011dec7ad65e4baba21ca44065043edb84de0f

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

diff --git a/debian/changelog b/debian/changelog
index ab0a4db..47c0c6b 100644
--- 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 62f850e..92e1765 100755
--- 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 \