projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0aaba69
)
added removal of temp file with sorted file list
author
Chris Koeritz
<fred@gruntose.com>
Thu, 11 Jul 2019 16:47:08 +0000
(16:47 +0000)
committer
Chris Koeritz
<fred@gruntose.com>
Thu, 11 Jul 2019 16:47:08 +0000
(16:47 +0000)
scripts/rev_control/diff_repos.sh
patch
|
blob
|
history
scripts/rev_control/push_repo_downstream.sh
patch
|
blob
|
history
scripts/rev_control/rcheckin.sh
patch
|
blob
|
history
scripts/rev_control/report_new.sh
patch
|
blob
|
history
scripts/rev_control/rgetem.sh
patch
|
blob
|
history
scripts/rev_control/rpuffer.sh
patch
|
blob
|
history
diff --git
a/scripts/rev_control/diff_repos.sh
b/scripts/rev_control/diff_repos.sh
index 32a5d48c6e94fc1287ff74520c9e1c5d2df054f6..5a6cf750ece71a566d1ba9f5787a1f021880e89f 100644
(file)
--- a/
scripts/rev_control/diff_repos.sh
+++ b/
scripts/rev_control/diff_repos.sh
@@
-25,5
+25,7
@@
popd &>/dev/null
perform_revctrl_action_on_file "$tempfile" do_revctrl_diff
exit_on_error "performing revision control action do_revctrl_diff on: $tempfile"
perform_revctrl_action_on_file "$tempfile" do_revctrl_diff
exit_on_error "performing revision control action do_revctrl_diff on: $tempfile"
+rm "$tempfile"
+
restore_terminal_title
restore_terminal_title
diff --git
a/scripts/rev_control/push_repo_downstream.sh
b/scripts/rev_control/push_repo_downstream.sh
index f12fc74080918d53cf90175c7cdcbf38fc9fe010..1fc6e0ba904d351ee99218237f47fc9218c989d4 100644
(file)
--- a/
scripts/rev_control/push_repo_downstream.sh
+++ b/
scripts/rev_control/push_repo_downstream.sh
@@
-53,6
+53,8
@@
exit_on_error "generating revision control file list"
perform_revctrl_action_on_file "$tempfile" do_revctrl_careful_update
exit_on_error "doing a careful update on: $tempfile"
perform_revctrl_action_on_file "$tempfile" do_revctrl_careful_update
exit_on_error "doing a careful update on: $tempfile"
+rm "$tempfile"
+
# seems to be needed to cause a merge to be resolved.
git pull downstream master
# -m "unfortunate merge"
# seems to be needed to cause a merge to be resolved.
git pull downstream master
# -m "unfortunate merge"
diff --git
a/scripts/rev_control/rcheckin.sh
b/scripts/rev_control/rcheckin.sh
index dc05cf47e1c8655461a9aea134d01d30405e2d5c..185de49e8c7a832351d4ada1a107611caa36bc44 100644
(file)
--- a/
scripts/rev_control/rcheckin.sh
+++ b/
scripts/rev_control/rcheckin.sh
@@
-25,4
+25,6
@@
popd &>/dev/null
perform_revctrl_action_on_file "$tempfile" do_revctrl_checkin
exit_on_error "doing a check-in on: $tempfile"
perform_revctrl_action_on_file "$tempfile" do_revctrl_checkin
exit_on_error "doing a check-in on: $tempfile"
+rm "$tempfile"
+
restore_terminal_title
restore_terminal_title
diff --git
a/scripts/rev_control/report_new.sh
b/scripts/rev_control/report_new.sh
index 5a057b0be2f6db8f74c1432ab4726444371d5955..8ecb8715147bf32aab000474f0a4899731ba39d1 100644
(file)
--- a/
scripts/rev_control/report_new.sh
+++ b/
scripts/rev_control/report_new.sh
@@
-26,5
+26,7
@@
popd &>/dev/null
perform_revctrl_action_on_file "$tempfile" do_revctrl_report_new
exit_on_error "running revision control report"
perform_revctrl_action_on_file "$tempfile" do_revctrl_report_new
exit_on_error "running revision control report"
+rm "$tempfile"
+
restore_terminal_title
restore_terminal_title
diff --git
a/scripts/rev_control/rgetem.sh
b/scripts/rev_control/rgetem.sh
index 529fae19b59e8e363602dd716222b1d419fc5d29..11b9edd4d7eb2bd1c61bec9f817acb10f56a69cd 100644
(file)
--- a/
scripts/rev_control/rgetem.sh
+++ b/
scripts/rev_control/rgetem.sh
@@
-25,5
+25,7
@@
popd &>/dev/null
perform_revctrl_action_on_file "$tempfile" do_revctrl_simple_update
exit_on_error "running revision control update"
perform_revctrl_action_on_file "$tempfile" do_revctrl_simple_update
exit_on_error "running revision control update"
+rm "$tempfile"
+
restore_terminal_title
restore_terminal_title
diff --git
a/scripts/rev_control/rpuffer.sh
b/scripts/rev_control/rpuffer.sh
index ddf163373ee5f4d03f69212c96f96f98497ff75a..d67332d37823b7e8ecb0e34979ba6aad630fe887 100644
(file)
--- a/
scripts/rev_control/rpuffer.sh
+++ b/
scripts/rev_control/rpuffer.sh
@@
-29,5
+29,7
@@
popd &>/dev/null
perform_revctrl_action_on_file "$tempfile" do_revctrl_careful_update
exit_on_error "puffing out repository at: $tempfile"
perform_revctrl_action_on_file "$tempfile" do_revctrl_careful_update
exit_on_error "puffing out repository at: $tempfile"
+rm "$tempfile"
+
restore_terminal_title
restore_terminal_title