101 |
sendmail_to= |
sendmail_to= |
102 |
exit_cmd=: |
exit_cmd=: |
103 |
|
|
104 |
|
# try to find out whether read supports -r |
105 |
|
if echo bt | tr b '\\' | { read -r line; test "X$line" = 'X\t'; } 2>/dev/null |
106 |
|
then |
107 |
|
read_r='read -r' |
108 |
|
else |
109 |
|
read_r=read |
110 |
|
fi |
111 |
|
|
112 |
# Locations for important files: |
# Locations for important files: |
113 |
signature_file= |
signature_file= |
114 |
log_dir="`func_mktempdir`" |
log_dir="`func_mktempdir`" |
305 |
func_verbose "$progname: checking for conflicts..." |
func_verbose "$progname: checking for conflicts..." |
306 |
if $opt_tla; then |
if $opt_tla; then |
307 |
if ( $TLA changes | |
if ( $TLA changes | |
308 |
while read line; do |
while $read_r line; do |
309 |
echo "$line" |
echo "$line" |
310 |
echo "$line" >&3 |
echo "$line" >&3 |
311 |
done | grep '^C' |
done | grep '^C' |
316 |
|
|
317 |
if test -f CVS/Entries; then |
if test -f CVS/Entries; then |
318 |
if ( $CVS $cvs_flags -q -n update $update_flags ${1+"$@"} | |
if ( $CVS $cvs_flags -q -n update $update_flags ${1+"$@"} | |
319 |
while read line; do |
while $read_r line; do |
320 |
echo "$line" |
echo "$line" |
321 |
echo "$line" >&3 |
echo "$line" >&3 |
322 |
done | grep '^C' |
done | grep '^C' |
348 |
if $opt_first; then |
if $opt_first; then |
349 |
skipping=: |
skipping=: |
350 |
$SED 's,^,+,' < ${ChangeLog-ChangeLog} | |
$SED 's,^,+,' < ${ChangeLog-ChangeLog} | |
351 |
while read line; do |
while $read_r line; do |
352 |
case "$line" in |
case "$line" in |
353 |
"+") if $skipping; then skipping=false; else break; fi;; |
"+") if $skipping; then skipping=false; else break; fi;; |
354 |
"+ "*) |
"+ "*) |
366 |
cmd="$CVS $cvs_flags diff -u" |
cmd="$CVS $cvs_flags diff -u" |
367 |
fi |
fi |
368 |
$cmd ${ChangeLog-ChangeLog} | |
$cmd ${ChangeLog-ChangeLog} | |
369 |
while read line; do |
while $read_r line; do |
370 |
case $line in |
case $line in |
371 |
"--- "*) :;; |
"--- "*) :;; |
372 |
"-"*) |
"-"*) |