From: ianmdlvl <ianmdlvl>
Date: Tue, 27 Dec 2005 23:00:16 +0000 (+0000)
Subject: cvs-repomove fixed for moving back to a place it's already been
X-Git-Tag: debian_version_4_0_99_0_20~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=18fc78da528c903ba181ccb4b7cfb90d94e9cbad

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

diff --git a/debian/changelog b/debian/changelog
index ea673fd..5f8cf66 100644
--- 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 cc50c25..62f850e 100755
--- 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
 	'")"