From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 20:05:52 +0000 (+0000)
Subject: this script needs help
X-Git-Tag: 2.140.92^2~1^2~6
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=e119f0f1cd5c6e64be0fa2c8739b999a591f48ee;p=feisty_meow.git

this script needs help

needs to be adapted to our new careful update method.
---

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index 84214b70..ef1bb35a 100644
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -47,6 +47,18 @@ test_or_die "changing to directory: $dir"
 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