Mercurial > hg > openttd
changeset 15263:73fd236bcc2f draft
(svn r19898) -Fix [FS#3853]: hg version detection fails for uncommited merges (planetmaker)
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Wed, 26 May 2010 23:01:10 +0000 |
| parents | d3e20a662b06 |
| children | f122721950d6 |
| files | findversion.sh |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/findversion.sh +++ b/findversion.sh @@ -101,7 +101,7 @@ if [ -n "`hg status \"$SRC_DIR\" | grep -v '^?'`" ]; then MODIFIED="2" fi - HASH=`LC_ALL=C hg parents --template="{node}"` + HASH=`LC_ALL=C hg id -i | cut -c1-12` REV="h`echo $HASH | cut -c1-8`" BRANCH=`hg branch | sed 's@^default$@@'` REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`