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 'dev' of feistymeow.org:feisty_meow into dev
[feisty_meow.git]
/
scripts
/
rev_control
/
version_control.sh
diff --git
a/scripts/rev_control/version_control.sh
b/scripts/rev_control/version_control.sh
index 75f344cf66ab8485f0e8b980f6b83c8eef924859..b1035c53549f633fdf1c23de8872abc7f0603938 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-64,7
+64,7
@@
function do_checkin()
if [ $nicedir == "." ]; then
nicedir=$(\pwd)
fi
if [ $nicedir == "." ]; then
nicedir=$(\pwd)
fi
- local blatt="echo
checking in '$nicedir'...
"
+ local blatt="echo
-n checking in '$nicedir'...
"
do_update "$directory"
test_or_die "repository update--this should be fixed before check-in."
do_update "$directory"
test_or_die "repository update--this should be fixed before check-in."
@@
-379,6
+379,8
@@
function do_careful_git_update()
show_branch_conditionally "$this_branch"
# this code is now doing what i have to do when i repair the repo. and it seems to be good so far.
show_branch_conditionally "$this_branch"
# this code is now doing what i have to do when i repair the repo. and it seems to be good so far.
+ # note that we allow the local branch to be merged with its remote counterpart; otherwise we would
+ # miss changes that happened elsewhere which should be seen in our local copy.
local branch_list=$(all_branch_names)
local bran
for bran in $branch_list; do
local branch_list=$(all_branch_names)
local bran
for bran in $branch_list; do