the same without syntax errors
authorColin Leroy <colin@colino.net>
Tue, 12 Apr 2005 17:58:06 +0000 (17:58 +0000)
committerColin Leroy <colin@colino.net>
Tue, 12 Apr 2005 17:58:06 +0000 (17:58 +0000)
commitHelper

index 4da0b4d..b55d974 100644 (file)
@@ -17,8 +17,13 @@ for file in $filelist; do
        merge=`echo $file | grep Merge`
        modif=`echo $file | grep Locally`
        patch=`echo $file | grep -i patch`
-       if [ "$merge" != "" || "$patch" != "" ]; then
-               echo $merge $patch
+       if [ "$patch" != "" ]; then
+               echo $patch 
+               echo You have to update first
+               exit
+       fi;
+       if [ "$merge" != "" ]; then
+               echo $merge 
                echo You have to update first
                exit
        fi;