moved branch name impacts

[feisty_meow.git] / scripts / rev_control / push_repo_downstream.sh

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index 50f8d80aa63f532851dc241ba241073c4e74753c..0135a40492310f3869d010babe785bd0329172af 100644 (file)
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -53,14 +53,20 @@ 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"
 
+rm "$tempfile"
+
 # seems to be needed to cause a merge to be resolved.
-git pull downstream master
+git pull downstream main
 # -m "unfortunate merge"
-exit_on_error "running the git pull downstream master"
+exit_on_error "running the git pull downstream main"
 
 # 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"
+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