Update Go library to r60.

[pf3gnuchains/gcc-fork.git] / libgo / merge.sh

diff --git a/libgo/merge.sh b/libgo/merge.sh
index 3696783..3c520ef 100644 (file)
--- a/libgo/merge.sh
+++ b/libgo/merge.sh
@@ -32,13 +32,13 @@ fi
 
 repository=$1
 
-merge_rev=`sed 1q MERGE`
+old_rev=`sed 1q MERGE`
 
 rm -rf ${OLDDIR}
-hg clone -r ${merge_rev} ${repository} ${OLDDIR}
+hg clone -r ${old_rev} ${repository} ${OLDDIR}
 
 rm -rf ${NEWDIR}
-hg clone ${repository} ${NEWDIR}
+hg clone -u release ${repository} ${NEWDIR}
 
 new_rev=`cd ${NEWDIR} && hg log | sed 1q | sed -e 's/.*://'`