the step backwards for our two forward

[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 991a3251d99fa8d9a9226643f80390ea0d43b6b0..d65c2f45bfab643ba13f86bd489eb58cbfb7a8b3 100644 (file)
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -48,9 +48,8 @@ test_or_die "changing to directory: $dir"
 tempfile=$(generate_rev_ctrl_filelist)
 test_or_die "generating revision control file list"
 
-#perform_revctrl_action_on_file "$tempfile" do_careful_git_update
-perform_revctrl_action_on_file "$tempfile" puff_out_list
-test_or_die "doing a careful git update on: $tempfile"
+perform_revctrl_action_on_file "$tempfile" do_careful_git_update
+test_or_die "doing a careful update on: $tempfile"
 
 # seems to be needed to cause a merge to be resolved.
 git pull downstream master