X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Fcvsdiffclient;h=66cd6b6e1fb732dcc489920950aa4a76039925f0;hp=ee14ecc7b67b1df0f2ad6f13b45dbf83ad9c7177;hb=d81556d5d57f2880f4571b46c1639bab154e60f4;hpb=41b2f7e44a049eb86bc275c1d1df4e34d68c47a4

diff --git a/build/cvsdiffclient b/build/cvsdiffclient
index ee14ecc..66cd6b6 100644
--- a/build/cvsdiffclient
+++ b/build/cvsdiffclient
@@ -6,14 +6,19 @@
 # in your .bashrc and you will get a nice bunch of CVS commit reminders:
 # <merge/land tag information>
 # b=<bug_number>
-# r=<reviewed by>
+# i=<inspected_by>
+# i=<inspected_by>
 #
 # Remember to remove the leading "CVS: " part of the comment before saving
 # your commit comment if you want those entries to be saved.
 
 [ -f .mergeinfo ] && . ./.mergeinfo
 
-FILES=`cvs-modified-files.pl $1`
+CVS_MODIFIED_FILES_PL=$(which cvs-modified-files.pl 2>/dev/null)
+if [ -z "$CVS_MODIFIED_FILES_PL" ]; then
+    CVS_MODIFIED_FILES_PL=$(dirname $0)/cvs-modified-files.pl
+fi
+FILES=$($CVS_MODIFIED_FILES_PL $1)
 TMP=`mktemp /tmp/cvslog-XXXXXXXX`
 if [ -f $TMP ]; then
 	[ -f .mergeinfo ] && . .mergeinfo
@@ -28,10 +33,15 @@ if [ -f $TMP ]; then
 		[ "$TAG" ] && BRANCH="`sed 's/^T//' $TAG`" || BRANCH="HEAD"
 		echo "CVS: Branch $BRANCH" >> $TMP
 	fi
-	echo "CVS: did you update the ChangeLog for a bug fix?" >> $TMP
-	echo "CVS: did you update the hours spent in Bugzilla?" >> $TMP
-	echo "CVS: b=<bug>" >> $TMP
-	echo "CVS: r=<reviewed_by>" >> $TMP
+cat - >> $TMP <<- EOF
+	CVS: Remove "CVS:" from start of lines that should be in commit message
+	CVS: did you update the ChangeLog for a bug fix?
+	CVS: did you update the hours spent in Bugzilla?
+	CVS: did you verify/update the HLD/DLD in CVS?
+	CVS: b=<bug>
+	CVS: i=<inspected_by>
+	CVS: i=<inspected_by>
+EOF
 
 	cat $1 >> $TMP
 	cp $TMP $1