X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fland1.sh;h=c21f3b9901222b77a69cdef874ad01cdef22239e;hb=0201023b739be4b8c15e48c34e77c0e14ca68c1a;hp=ef875e64b2a62c94c7582ee0ddb9a48d0c448caa;hpb=a5debac55d7b148b99f0660e8865683c088ab6bf;p=fs%2Flustre-release.git diff --git a/build/land1.sh b/build/land1.sh index ef875e6..c21f3b9 100755 --- a/build/land1.sh +++ b/build/land1.sh @@ -102,7 +102,7 @@ echo "done" # Apply all of the changes to your local tree: echo -n "Updating as -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date ..." -$CVS update -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date $dir +$CVS update -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date -dP $dir echo "done" echo -n "Recording conflicts in $CONFLICTS ..."