From e507a30a73f541f11b17804264bdd9242c2ed8ed Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Fri, 23 Apr 2004 01:55:34 +0000
Subject: [PATCH] A few more improvements.

---
 verify-patches | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/verify-patches b/verify-patches
index 2c48234..e620619 100755
--- a/verify-patches
+++ b/verify-patches
@@ -32,26 +32,32 @@ for xx in "${@}"; do
     *.diff) xx=../../$xx ;;
     *) continue ;;
     esac
-    rsync -a --delete ../,cvsdir/ .
-    echo -e "\n----------- $xx ------------"
-    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
+    apply=y
     while : ; do
-	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
+	    apply=n
+	fi
+	echo -e "\nFix rejects, Make proto, Edit both diffs, Update patch,"
+	echo -n "Apply patch again, Next, Quit: [n] "
 	read ans
 	case "$ans" in
 	[Ee]*)
 	    [ ! -z "$new" ] && cvs add $new
 	    new=''
 	    rm -f *.rej *.orig
+	    sed '/^--- /,$ d' $xx >,new.patch
 	    cvs diff -N | grep -v '^Index: ' |
 		grep -v '^=========' |
 		grep -v '^diff -' |
 		grep -v '^RCS file: ' |
-		grep -v '^retrieving revision ' >,new.patch
+		grep -v '^retrieving revision ' >>,new.patch
 	    vim -d $xx ,new.patch
 	    ;;
 	[Ff]*)
@@ -69,6 +75,9 @@ for xx in "${@}"; do
 		echo -e "\n*** Edit the diffs first. ***"
 	    fi
 	    ;;
+	[Aa]*)
+	    apply=y
+	    ;;
 	[Nn]*|'')
 	    break
 	    ;;
-- 
2.34.1