had to take an entirely different approach

git stash doesn't work on files that were previously configured in .gitignore, so we need to actually whack them.  and it's possible something else is hosed, so we force a reset to the head revision.  if that doesn't fix this, not sure what will.

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 77c4d91255dee82abdfac8254003bee7485b083d..8c902c3790064b612f0eb5100a48364eb22eadd0 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -137,19 +137,30 @@ test_or_die "changing dir to fred's home; what have you done with fred?"
 pushd apps/mapsdemo/avenger5
 test_or_die "changing dir to mapsdemo app"
 
-# gets rid of the old version of configs.
-git stash 
-test_or_die "stashing unwanted mapsdemo changes"
-git stash drop 
-# intentionally ignore error, if there was nothing to drop.
+rpuffer . &>/dev/null
+if [ $? -ne 0 ]; then
+  # it seems our old files are still conflicting this.
+  if [ -f config/config_google.php ]; then
+    \rm -f config/config_google.php
+    test_or_die "removing old config for google"
+  fi
+  if [ -f config/app.php ]; then
+    \rm -f config/app.php
+    test_or_die "removing old config for app"
+  fi
+
+  git reset --hard HEAD
+  test_or_die "resetting git's hard head"
+
+  rpuffer .
+#hmmm: use output saver thing when that exists.
+  test_or_die "puffing out mapsdemo app after inadequate corrective action was taken"
+fi
 
 popd
 
-rpuffer apps
-test_or_die "puffing out apps directory"
-
 popd
-#...coolness
+#...coolness, if we got to here.
 
 ##############