Branch HEAD

[fs/lustre-release.git] / build / merge1.sh

diff --git a/build/merge1.sh b/build/merge1.sh
index b648303..cbd3227 100755 (executable)
--- a/build/merge1.sh
+++ b/build/merge1.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e 
+#!/bin/bash -e 
 
 CONFLICTS=cvs-merge-conflicts
 CVS="cvs -z3"
@@ -51,6 +51,7 @@ if [ "$child" != "HEAD" -a "`cat $dir/CVS/Tag 2> /dev/null`" != "T$child" ]; the
 fi
 
 TEST_FILE=${TEST_FILE:-ChangeLog} # does this need to be smarter?
+[ $dir = "build" ] && TEST_FILE=lbuild
 check_tag() {
        [ -z "$1" ] && echo "check_tag() missing arg" && exit3
        [ "$1" = "HEAD" ] && return