Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- should init kptllnd_data.kptl_idle_txs before calling kptllnd_shutdown.
[fs/lustre-release.git]
/
build
/
merge1.sh
diff --git
a/build/merge1.sh
b/build/merge1.sh
index
1fcebec
..
cbd3227
100755
(executable)
--- a/
build/merge1.sh
+++ b/
build/merge1.sh
@@
-1,4
+1,4
@@
-#!/bin/sh -e
+#!/bin/
ba
sh -e
CONFLICTS=cvs-merge-conflicts
CVS="cvs -z3"
CONFLICTS=cvs-merge-conflicts
CVS="cvs -z3"
@@
-14,7
+14,7
@@
if [ -f $CONFLICTS ] ; then
fi
if [ $# -lt 2 -o $# -gt 3 ]; then
fi
if [ $# -lt 2 -o $# -gt 3 ]; then
- echo "This is phase 1 of merging branches. Usage: $0 parent child
[dir]
"
+ echo "This is phase 1 of merging branches. Usage: $0 parent child
dir
"
exit
fi
exit
fi
@@
-28,7
+28,7
@@
dir=${3:-.}
module=$(basename $(<$dir/CVS/Repository))
if [ "$module" = "lustre" ] ; then
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
echo >&2 "${progname}: Try using ${0} $parent $child lustre"
exit 1
fi
@@
-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?
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
check_tag() {
[ -z "$1" ] && echo "check_tag() missing arg" && exit3
[ "$1" = "HEAD" ] && return