projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleaned old code, fixed path
[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 b2da88704a60f4ace4290f638e8be69cc1eb6030..485c1ede1ff9561cdd05a9a3e7d769ca73af6707 100644
(file)
--- a/
scripts/rev_control/push_repo_downstream.sh
+++ b/
scripts/rev_control/push_repo_downstream.sh
@@
-51,9
+51,14
@@
test_or_die "generating revision control file list"
perform_revctrl_action_on_file "$tempfile" do_careful_git_update
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 git update on: $tempfile"
+# seems to be needed to cause a merge to be resolved.
+git pull downstream master
+# -m "unfortunate merge"
+test_or_die "running the git pull downstream master"
+
# send our little boat down the stream to the dependent repository.
# send our little boat down the stream to the dependent repository.
-git push downstream master
-test_or_die "running the git push downstream"
+git push
--tags
downstream master
+test_or_die "running the git push downstream
master
"
popd &>/dev/null
popd &>/dev/null