projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release-2.140.122'
[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 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"
+rm "$tempfile"
+
# seems to be needed to cause a merge to be resolved.
git pull downstream master
# -m "unfortunate merge"