X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_downstream.sh;h=ef1bb35a6a49b553c992c08050e62da419afef70;hb=e119f0f1cd5c6e64be0fa2c8739b999a591f48ee;hp=0d0dcaa7567218ca6bdbf994cc1b968b7e592aa9;hpb=94563cdf4ab63816d2d046fb69f0748a14f97554;p=feisty_meow.git

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index 0d0dcaa7..ef1bb35a 100644
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -30,27 +30,41 @@
 #
 # 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"
 
 # 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.
-#needed? git pull
+git fetch --all
+
+# merge the changes in.
+git merge --no-ff --all
 
 # turn off occasionally troublesome setting before checkin.
 unset GIT_SSH
 
 # send the little boat down the stream to the dependent repository.
 git push downstream master
+test_or_die "running the git push downstream"
 
-popd
-
+popd &>/dev/null