X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_downstream.sh;h=4e1530f8e29c280cde90c24dc98c695d31fd0344;hb=d5e14241a2e10e5d4a1f3c7969881a761ec40af8;hp=2f4e3db1d2647e616632eb3d88d2053811e18e8b;hpb=170a8e062d9283e65716e7aa55930ade13a66f7a;p=feisty_meow.git

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index 2f4e3db1..4e1530f8 100644
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -30,19 +30,39 @@
 #
 # push_repo_downstream ~/relay_repo_folder
 
-#hmmm: make this support multiple dirs?
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
+
+##############
 
 dir="$1"; shift
 if [ -z "$dir" ]; then
   dir=.
 fi
 
-pushd "$dir"
+pushd "$dir" &>/dev/null
+test_or_die "changing to directory: $dir"
+
+#switch this to the perform revctrl with a do_git_careful_update
+
+
 
 # get everything from the origin.
 git fetch origin
 test_or_die "running git fetch origin"
 
+
+#these are all shots in the dark.
+# use our careful updater!
+
+git remote update
+
+# get everything from the origin.
+git fetch --all
+
+# merge the changes in.
+git merge --no-ff --all
+
 # turn off occasionally troublesome setting before checkin.
 unset GIT_SSH
 
@@ -50,6 +70,5 @@ unset GIT_SSH
 git push downstream master
 test_or_die "running the git push downstream"
 
-popd
-
+popd &>/dev/null