From e119f0f1cd5c6e64be0fa2c8739b999a591f48ee Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 10 Nov 2017 20:05:52 +0000 Subject: [PATCH] this script needs help needs to be adapted to our new careful update method. --- scripts/rev_control/push_repo_downstream.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 -- 2.34.1