X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fbranch.sh;h=0b9b1cd2cc1d12dda74a36b33b2fef4db6eddf1a;hb=be86ec961aada9055d543e449979202b4e775136;hp=591213fc4f5dd41cb95950864ee775a584510d76;hpb=ec54526780f06eb596829eb6a2e40da46c70d983;p=fs%2Flustre-release.git diff --git a/build/branch.sh b/build/branch.sh index 591213f..0b9b1cd 100755 --- a/build/branch.sh +++ b/build/branch.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e CVS=${CVS:-cvs} progname=${0##*/} @@ -35,13 +35,13 @@ case $child in *) child="b_$child" esac -if [ "$parent" != "HEAD" -a -f $dir/CVS/Tag ]; then +#if [ "$parent" != "HEAD" -a -f $dir/CVS/Tag ]; then # put in separate condition as bash evaluates all conditions unlike C - if [ "`cat $dir/CVS/Tag`" != "T$parent" ]; then - echo "This script must be run within the $parent branch" - exit 1 - fi -fi +# if [ "`cat $dir/CVS/Tag`" != "T$parent" ]; then +# echo "This script must be run within the $parent branch" +# exit 1 +# fi +#fi echo parent: $parent CHILD: $CHILD child: $child date: $date