From: adilger <adilger>
Date: Mon, 30 May 2005 20:25:33 +0000 (+0000)
Subject: HEAD
X-Git-Tag: 1.4.10~1070
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=3d1ec8975edb90ff71e53484726e7a21764eebab;p=fs%2Flustre-release.git

HEAD
Fix error messages.
---

diff --git a/build/land1.sh b/build/land1.sh
index ce152f7..6765c37 100755
--- a/build/land1.sh
+++ b/build/land1.sh
@@ -30,7 +30,7 @@ dir=${3:-.}
 module=$(basename $(<$dir/CVS/Repository))
 
 if [ "$module" = "lustre" ] ; then
-    echo >&2 "${progname}: You probably want to branch lustre or portals, not the whole tree."
+    echo >&2 "${progname}: You probably want to land lustre or portals, not the whole tree."
     echo >&2 "${progname}: Try using ${0} $parent $child lustre"
     exit 1
 fi
diff --git a/build/merge1.sh b/build/merge1.sh
index d874054..b648303 100755
--- a/build/merge1.sh
+++ b/build/merge1.sh
@@ -28,7 +28,7 @@ dir=${3:-.}
 module=$(basename $(<$dir/CVS/Repository))
 
 if [ "$module" = "lustre" ] ; then
-    echo >&2 "${progname}: You probably want to branch lustre or portals, not the whole tree."
+    echo >&2 "${progname}: You probably want to merge lustre or portals, not the whole tree."
     echo >&2 "${progname}: Try using ${0} $parent $child lustre"
     exit 1
 fi