Mercurial > hg > release > icedtea7-2.0
changeset 2424:c12aafe2de1b
PR497: Mercurial revision detection not very reliable
2011-02-22 Andrew John Hughes <ahughes@redhat.com>
PR497: Mercurial revision detection not very reliable
* acinclude.m4:
(IT_OBTAIN_HG_REVISIONS): Use hg id rather
than hg tip.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Tue, 22 Feb 2011 12:52:39 +0000 |
| parents | eff72c004141 |
| children | 97063b48abc0 |
| files | ChangeLog acinclude.m4 |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 25 01:37:57 2011 +0100 +++ b/ChangeLog Tue Feb 22 12:52:39 2011 +0000 @@ -1,3 +1,10 @@ +2011-02-22 Andrew John Hughes <ahughes@redhat.com> + + PR497: Mercurial revision detection not very reliable + * acinclude.m4: + (IT_OBTAIN_HG_REVISIONS): Use hg id rather + than hg tip. + 2011-02-22 Andrew John Hughes <ahughes@redhat.com> PR103: Usage of native2ascii during bootstrap.
--- a/acinclude.m4 Wed May 25 01:37:57 2011 +0100 +++ b/acinclude.m4 Tue Feb 22 12:52:39 2011 +0000 @@ -1677,19 +1677,19 @@ if which ${HG} >&AS_MESSAGE_LOG_FD 2>&1; then AC_MSG_CHECKING([for IcedTea Mercurial revision ID]) if test -e ${abs_top_srcdir}/.hg ; then - ICEDTEA_REVISION="r`(cd ${abs_top_srcdir}; ${HG} tip --template '{node|short}')`" ; + ICEDTEA_REVISION="r`(cd ${abs_top_srcdir}; ${HG} id -i)`" ; fi ; AC_MSG_RESULT([${ICEDTEA_REVISION}]) AC_SUBST([ICEDTEA_REVISION]) AC_MSG_CHECKING([for JDK Mercurial revision ID]) if test -e ${OPENJDK_SRC_DIR}/jdk/.hg ; then - JDK_REVISION="r`(cd ${OPENJDK_SRC_DIR}/jdk; ${HG} tip --template '{node|short}')`" ; + JDK_REVISION="r`(cd ${OPENJDK_SRC_DIR}/jdk; ${HG} id -i)`" ; fi ; AC_MSG_RESULT([${JDK_REVISION}]) AC_SUBST([JDK_REVISION]) AC_MSG_CHECKING([for HotSpot Mercurial revision ID]) if test -e ${OPENJDK_SRC_DIR}/hotspot/.hg ; then \ - HOTSPOT_REVISION="r`(cd ${OPENJDK_SRC_DIR}/hotspot; ${HG} tip --template '{node|short}')`" ; + HOTSPOT_REVISION="r`(cd ${OPENJDK_SRC_DIR}/hotspot; ${HG} id -i)`" ; fi ; AC_MSG_RESULT([${HOTSPOT_REVISION}]) AC_SUBST([HOTSPOT_REVISION])