projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better output yet
[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 3016a77ce7e288081a6e9e1ae436d26100184a4f..9b9704c286b0d82ad27c570636008e01ba91ea2d 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-90,7
+90,7
@@
function do_checkin()
local blatt="echo -ne \nchecking in '$nicedir'... "
do_update "$directory"
local blatt="echo -ne \nchecking in '$nicedir'... "
do_update "$directory"
- exit_on_error "
repository update--this
should be fixed before check-in."
+ exit_on_error "
updating repository; this issue
should be fixed before check-in."
pushd "$directory" &>/dev/null
if [ -f ".no-checkin" ]; then
pushd "$directory" &>/dev/null
if [ -f ".no-checkin" ]; then
@@
-371,6
+371,7
@@
function do_careful_git_update()
if [ ! -d ".git" ]; then
# not a git project, so just boil this down to a getem action.
popd &>/dev/null
if [ ! -d ".git" ]; then
# not a git project, so just boil this down to a getem action.
popd &>/dev/null
+echo "special case; not doing careful git update on non git repository: $directory"
do_update "$directory"
return $?
fi
do_update "$directory"
return $?
fi
@@
-438,7
+439,7
@@
function do_update()
if [ $nicedir == "." ]; then
nicedir=$(\pwd)
fi
if [ $nicedir == "." ]; then
nicedir=$(\pwd)
fi
- local blatt="echo retrieving '$nicedir'..."
+ local blatt="echo
-e \n
retrieving '$nicedir'..."
pushd "$directory" &>/dev/null
if [ -d "CVS" ]; then
pushd "$directory" &>/dev/null
if [ -d "CVS" ]; then