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
b=21966 can not mount mdt after umount
[fs/lustre-release.git]
/
build
/
merge2.sh
diff --git
a/build/merge2.sh
b/build/merge2.sh
index
43586f0
..
0ef27cc
100755
(executable)
--- a/
build/merge2.sh
+++ b/
build/merge2.sh
@@
-1,4
+1,4
@@
-#!/bin/sh -e
+#!/bin/
ba
sh -e
if [ ! -f .mergeinfo ] ; then
echo ".mergeinfo doesn't exist - exit"
if [ ! -f .mergeinfo ] ; then
echo ".mergeinfo doesn't exist - exit"
@@
-7,6
+7,12
@@
fi
. .mergeinfo
. .mergeinfo
+if [ "$OPERATION" != "Merge" ] ; then
+ echo "OPERATION must be Merge - is $OPERATION"
+ echo "You should probably be running ${OPERATION}2.sh"
+ exit
+fi
+
if [ -f $CONFLICTS ] ; then
echo "$CONFLICTS exists - clean up first"
cat $CONFLICTS
if [ -f $CONFLICTS ] ; then
echo "$CONFLICTS exists - clean up first"
cat $CONFLICTS