projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pushing down some cakelampvm details
[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 910efd06d84437d57bdb6324ca567dad2d5c10b4..d65c2f45bfab643ba13f86bd489eb58cbfb7a8b3 100644
(file)
--- a/
scripts/rev_control/push_repo_downstream.sh
+++ b/
scripts/rev_control/push_repo_downstream.sh
@@
-47,14
+47,18
@@
pushd "$dir" &>/dev/null
test_or_die "changing to directory: $dir"
tempfile=$(generate_rev_ctrl_filelist)
test_or_die "generating revision control file list"
test_or_die "changing to directory: $dir"
tempfile=$(generate_rev_ctrl_filelist)
test_or_die "generating revision control file list"
-popd &>/dev/null
perform_revctrl_action_on_file "$tempfile" do_careful_git_update
perform_revctrl_action_on_file "$tempfile" do_careful_git_update
-test_or_die "doing a careful git update on: $tempfile"
+test_or_die "doing a careful 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