From 15ccfff12cc5a834ba13a0b45cc44163734b5cb4 Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Sat, 16 Jan 2010 18:29:52 +0000 Subject: [PATCH] Read "Last Changed Rev" field instead of "Revision" field to avoid being affected by changes in other directories (such as branches). Originally committed as revision 21252 to svn://svn.ffmpeg.org/ffmpeg/trunk --- version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.sh b/version.sh index 70679cc7f0..774e514c22 100755 --- a/version.sh +++ b/version.sh @@ -2,8 +2,8 @@ # check for SVN revision number revision=$(cd "$1" && cat snapshot_version 2> /dev/null) -test $revision || revision=$(cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2) -test $revision || revision=$(cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2) +test $revision || revision=$(cd "$1" && LC_ALL=C svn info 2> /dev/null | grep "Last Changed Rev" | cut -d' ' -f4) +test $revision || revision=$(cd "$1" && grep committed-rev .svn/entries 2>/dev/null | head -n 1 | cut -d '"' -f2) test $revision || revision=$(cd "$1" && sed -n -e '/^dir$/{n p q