X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_downstream.sh;h=1fc6e0ba904d351ee99218237f47fc9218c989d4;hb=39a360f8ff58449cd345972729763c3accd65eda;hp=50f8d80aa63f532851dc241ba241073c4e74753c;hpb=04d1ca71956065bc82b6871d50ad110be6c23b88;p=feisty_meow.git diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh index 50f8d80a..1fc6e0ba 100644 --- a/scripts/rev_control/push_repo_downstream.sh +++ b/scripts/rev_control/push_repo_downstream.sh @@ -53,6 +53,8 @@ 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 # -m "unfortunate merge" @@ -62,6 +64,10 @@ exit_on_error "running the git pull downstream master" 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