Whamcloud - gitweb
r=phil
[fs/lustre-release.git] / lustre / scripts / cvsdiffclient
1 #!/bin/bash
2
3 [ -f .mergeinfo ] && . ./.mergeinfo
4
5 FILES=`cvs-modified-files.pl $1`
6 TMP=`mktemp /tmp/cvslog-XXXXXXXX`
7 if [ -f $TMP ]; then
8         [ -f .mergeinfo ] && \
9                 echo "CVS: Update $child from $parent ($date)" >> $TMP
10         echo "CVS: did you update the ChangeLog for a bug fix?" >> $TMP
11         echo "CVS: b=" >> $TMP
12         echo "CVS: r=" >> $TMP
13
14         cat $1 >> $TMP
15         cp $TMP $1
16         rm $TMP
17 fi
18
19 if [ "${FILES:+have_files}"x = have_filesx ]; then
20   echo Diffing $1 : $FILES
21   cvs diff -wbBup $FILES 2>/dev/null | sed "s/^/CVS: /" >>$1
22 fi
23 #gnuclient $1 || vi $1
24 [ "$EDITOR" ] || EDITOR=vi
25
26 $EDITOR $1