diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2010-01-16 18:29:52 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2010-01-16 18:29:52 +0000 |
| commit | 15ccfff12cc5a834ba13a0b45cc44163734b5cb4 (patch) | |
| tree | 17a91985d13a67cc1e07be034c92580ef387cd32 | |
| parent | 7931bb2a0c46525569c06a6116ed5b31c37adef5 (diff) | |
| download | ffmpeg-15ccfff12cc5a834ba13a0b45cc44163734b5cb4.tar.gz | |
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
| -rwxr-xr-x | version.sh | 4 |
1 files 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 |