git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't assume hg convert in gcc_update 

* gcc_update: Determine svn branch from hg convert_revision.

From-SVN: r178056
This commit is contained in:
Rainer Orth 2011-08-25 09:16:52 +00:00 committed by Rainer Orth
parent 8619577f3a
commit 39b75e51ec
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/ChangeLog
View File

@ -1,3 +1,7 @@
2011-08-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* gcc_update: Determine svn branch from hg convert_revision.
2011-07-18 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> 2011-07-18 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* config-list.mk (i586-netware): Remove. * config-list.mk (i586-netware): Remove.

9
contrib/gcc_update
View File

@ -340,14 +340,13 @@ case $vcs_type in
# corresponding to the extra: tag, so need to use hg log --debug # corresponding to the extra: tag, so need to use hg log --debug
# to extract the info. # to extract the info.
parents=`$GCC_HG parents --template '{rev}'` parents=`$GCC_HG parents --template '{rev}'`
revision=`$GCC_HG log --debug -r$parents | \ convert_revision=`$GCC_HG log --debug -r$parents | \
sed -ne "/^extra:.*convert_revision=svn:/ { sed -ne "/^extra:.*convert_revision=svn:/ {
s%^.*@%% s%^[^/]*/%%
p p
}"` }"`
branch=`$GCC_HG branch` revision=`echo $convert_revision | sed -e 's/.*@//'`
# trunk in SVN parlance shows up as default branch in hg. branch=`echo $convert_revision | sed -e 's%branches/%%' -e 's/@.*//'`
[ x$branch = x"default" ] && branch="trunk"
;; ;;
svn) svn)