X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_downstream.sh;h=0135a40492310f3869d010babe785bd0329172af;hb=b4f6c54a3726553a6f0f6c2ba017d0195c01344d;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..0135a404 100644
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -30,27 +30,44 @@
 #
 # 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"
+
+save_terminal_title
+
+# turn off occasionally troublesome setting before checkin.
+unset GIT_SSH
+
+##############
 
 dir="$1"; shift
 if [ -z "$dir" ]; then
   dir=.
 fi
 
-pushd "$dir"
+pushd "$dir" &>/dev/null
+exit_on_error "changing to directory: $dir"
+tempfile=$(generate_rev_ctrl_filelist)
+exit_on_error "generating revision control file list"
 
-# get everything from the origin.
-git fetch origin
+perform_revctrl_action_on_file "$tempfile" do_revctrl_careful_update
+exit_on_error "doing a careful update on: $tempfile"
 
-# get everything from the origin.
-#needed? git pull
+rm "$tempfile"
 
-# turn off occasionally troublesome setting before checkin.
-unset GIT_SSH
+# seems to be needed to cause a merge to be resolved.
+git pull downstream main
+# -m "unfortunate merge"
+exit_on_error "running the git pull downstream main"
 
-# send the little boat down the stream to the dependent repository.
-git push downstream master
+# send our little boat down the stream to the dependent repository.
+git push --tags downstream main
+exit_on_error "running the git push downstream main"
 
-popd
+# do our dev branch also.
+git push --tags downstream dev
+continue_on_error "running the git push downstream dev: is there a dev branch?"
 
+popd &>/dev/null
 
+restore_terminal_title