diff options
| -rw-r--r-- | contrib/ChangeLog | 4 | ||||
| -rwxr-xr-x | contrib/gcc_update | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index e68679d..07adb58 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -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> * config-list.mk (i586-netware): Remove. diff --git a/contrib/gcc_update b/contrib/gcc_update index c368936..c719502 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -340,14 +340,13 @@ case $vcs_type in # corresponding to the extra: tag, so need to use hg log --debug # to extract the info. 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:/ { - s%^.*@%% + s%^[^/]*/%% p }"` - branch=`$GCC_HG branch` - # trunk in SVN parlance shows up as default branch in hg. - [ x$branch = x"default" ] && branch="trunk" + revision=`echo $convert_revision | sed -e 's/.*@//'` + branch=`echo $convert_revision | sed -e 's%branches/%%' -e 's/@.*//'` ;; svn) |