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

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index aacd7772..281cc7e9 100644
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -44,17 +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)
-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_careful_git_update
+exit_on_error "doing a careful update on: $tempfile"
 
-perform_revctrl_action_on_file "$tempfile" do_careful_git_update "$(\pwd)"
-test_or_die "doing a careful git update on: $tempfile"
+# 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 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 master
+exit_on_error "running the git push downstream master"
 
 popd &>/dev/null