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
# -m "unfortunate merge"
git push --tags downstream master
exit_on_error "running the git push downstream master"
+# 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