X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_downstream.sh;h=281cc7e9e8ea917a21b0ccd6cfc4d3bf85b0ac4b;hb=d5eb622d41a49eb525e0df6639444945df9fd2ae;hp=84214b70a58b04f05423a029420ff76ef7c6e527;hpb=9767543e09806172d5ff8bd3f4d8cb9ddd087601;p=feisty_meow.git

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index 84214b70..281cc7e9 100644
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -33,6 +33,9 @@
 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
 
+# turn off occasionally troublesome setting before checkin.
+unset GIT_SSH
+
 ##############
 
 dir="$1"; shift
@@ -41,18 +44,21 @@ 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)
+exit_on_error "generating revision control file list"
 
-# get everything from the origin.
-git fetch origin
-test_or_die "running git fetch origin"
+perform_revctrl_action_on_file "$tempfile" do_careful_git_update
+exit_on_error "doing a careful update on: $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 master
+# -m "unfortunate merge"
+exit_on_error "running the git pull downstream master"
 
-# send the little boat down the stream to the dependent repository.
-git push downstream master
-test_or_die "running the git push downstream"
+# send our little boat down the stream to the dependent repository.
+git push --tags downstream master
+exit_on_error "running the git push downstream master"
 
 popd &>/dev/null