pseudocode

[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 84214b70a58b04f05423a029420ff76ef7c6e527..4e1530f8e29c280cde90c24dc98c695d31fd0344 100644 (file)
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -43,10 +43,26 @@ fi
 pushd "$dir" &>/dev/null
 test_or_die "changing to directory: $dir"
 
+#switch this to the perform revctrl with a do_git_careful_update
+
+
+
 # get everything from the origin.
 git fetch origin
 test_or_die "running git fetch origin"
 
+
+#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