projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
using multi-file and better named method
[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 485c1ede1ff9561cdd05a9a3e7d769ca73af6707..991a3251d99fa8d9a9226643f80390ea0d43b6b0 100644
(file)
--- a/
scripts/rev_control/push_repo_downstream.sh
+++ b/
scripts/rev_control/push_repo_downstream.sh
@@
-48,7
+48,8
@@
test_or_die "changing to directory: $dir"
tempfile=$(generate_rev_ctrl_filelist)
test_or_die "generating revision control file list"
tempfile=$(generate_rev_ctrl_filelist)
test_or_die "generating revision control file list"
-perform_revctrl_action_on_file "$tempfile" do_careful_git_update
+#perform_revctrl_action_on_file "$tempfile" do_careful_git_update
+perform_revctrl_action_on_file "$tempfile" puff_out_list
test_or_die "doing a careful git update on: $tempfile"
# seems to be needed to cause a merge to be resolved.
test_or_die "doing a careful git update on: $tempfile"
# seems to be needed to cause a merge to be resolved.