chiark / gitweb /
cvs-repomove fixed for moving back to a place it's already been
authorianmdlvl <ianmdlvl>
Tue, 27 Dec 2005 23:00:16 +0000 (23:00 +0000)
committerianmdlvl <ianmdlvl>
Tue, 27 Dec 2005 23:00:16 +0000 (23:00 +0000)
debian/changelog
scripts/cvs-repomove

index ea673fd..5f8cf66 100644 (file)
@@ -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.
index cc50c25..62f850e 100755 (executable)
@@ -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
        '")"