source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
+save_terminal_title
+
+# turn off occasionally troublesome setting before checkin.
+unset GIT_SSH
+
##############
dir="$1"; shift
fi
pushd "$dir" &>/dev/null
-test_or_die "changing to directory: $dir"
-
-#switch this to the perform revctrl with a do_git_careful_update
-
+exit_on_error "changing to directory: $dir"
+tempfile=$(generate_rev_ctrl_filelist)
+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"
-# get everything from the origin.
-git fetch origin
-test_or_die "running git fetch origin"
+rm "$tempfile"
+# seems to be needed to cause a merge to be resolved.
+git pull downstream main
+# -m "unfortunate merge"
+exit_on_error "running the git pull downstream main"
-#these are all shots in the dark.
-# use our careful updater!
-
-git remote update
-
-# get everything from the origin.
-git fetch --all
-
-# merge the changes in.
-git merge --no-ff --all
-
-# turn off occasionally troublesome setting before checkin.
-unset GIT_SSH
+# send our little boat down the stream to the dependent repository.
+git push --tags downstream main
+exit_on_error "running the git push downstream main"
-# send the little boat down the stream to the dependent repository.
-git push downstream master
-test_or_die "running the git push downstream"
+# 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