X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_downstream.sh;h=0135a40492310f3869d010babe785bd0329172af;hb=b4f6c54a3726553a6f0f6c2ba017d0195c01344d;hp=910efd06d84437d57bdb6324ca567dad2d5c10b4;hpb=ac0743f0d59ced44a36a9c58b8c1520671f8c932;p=feisty_meow.git

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index 910efd06..0135a404 100644
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -33,6 +33,8 @@
 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
 
@@ -44,17 +46,28 @@ if [ -z "$dir" ]; then
 fi
 
 pushd "$dir" &>/dev/null
-test_or_die "changing to directory: $dir"
+exit_on_error "changing to directory: $dir"
 tempfile=$(generate_rev_ctrl_filelist)
-test_or_die "generating revision control file list"
-popd &>/dev/null
+exit_on_error "generating revision control file list"
+
+perform_revctrl_action_on_file "$tempfile" do_revctrl_careful_update
+exit_on_error "doing a careful update on: $tempfile"
 
-perform_revctrl_action_on_file "$tempfile" do_careful_git_update
-test_or_die "doing a careful git update on: $tempfile"
+rm "$tempfile"
+
+# 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 our little boat down the stream to the dependent repository.
-git push downstream master
-test_or_die "running the git push downstream"
+git push --tags downstream main
+exit_on_error "running the git push downstream main"
+
+# 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