X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_downstream.sh;h=d65c2f45bfab643ba13f86bd489eb58cbfb7a8b3;hb=dbebc751162f353ca8a4df80656e96bf51d37e01;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..d65c2f45 100644
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -47,14 +47,18 @@ pushd "$dir" &>/dev/null
 test_or_die "changing to directory: $dir"
 tempfile=$(generate_rev_ctrl_filelist)
 test_or_die "generating revision control file list"
-popd &>/dev/null
 
 perform_revctrl_action_on_file "$tempfile" do_careful_git_update
-test_or_die "doing a careful git update on: $tempfile"
+test_or_die "doing a careful update on: $tempfile"
+
+# seems to be needed to cause a merge to be resolved.
+git pull downstream master
+# -m "unfortunate merge"
+test_or_die "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
+test_or_die "running the git push downstream master"
 
 popd &>/dev/null