- echo -ne "\nFix rejections, Make proto.h, Edit diffs, Update, Next, Quit: [n] "
+ echo -e "\n----------- $xx ------------"
+ if [ $apply = y ]; then
+ rsync -a --delete ../cvsdir/ .
+ patch -p0 <$xx | tee ,patch.output
+ new=''
+ for nn in `sed -n 's/^patching file //p' ,patch.output`; do
+ [ -f ../cvsdir/$nn ] || new="$new $nn"
+ done
+ if grep "^Hunk #[0-9]* FAILED" ,patch.output >/dev/null; then
+ default=F
+ elif grep "^Hunk #[0-9]* succeeded" ,patch.output >/dev/null; then
+ default=E
+ else
+ default=N
+ fi
+ apply=n
+ fi
+ echo -e "\nFix rejects, Edit both diffs, Update patch,"
+ echo -n "Apply patch again, Next, Quit: [$default] "