diff --git a/build/land1.sh b/build/land1.sh index 6765c37bb8d757390a0c5b4b97d6cc8645b7d030..d3d643ed70b5373746aa27da01fecb5dac1f5790 100755 --- a/build/land1.sh +++ b/build/land1.sh @@ -106,7 +106,8 @@ $CVS update -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date $dir echo "done" echo -n "Recording conflicts in $CONFLICTS ..." -if $CVS update | grep '^C' > $CONFLICTS; then +$CVS update | awk '/^C/ { print $2 }' > $CONFLICTS +if [ -s $CONFLICTS ] ; then echo "Conflicts found, fix before committing." cat $CONFLICTS else