bzr-version-gen: consider only the last tag.

diff --git a/ChangeLog b/ChangeLog
index 48e9bf5b35513c9b85805e923260bea85ce3b810..bdbc5dd4aeed7143c3de070b0d98a0963bf07418 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-11  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * build-aux/bzr-version-gen (TAG): Consider only the last tag.
+

 2011-08-10  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * configure.ac: Print usage string for --with-ssl.
 2011-08-10  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * configure.ac: Print usage string for --with-ssl.

diff --git a/build-aux/bzr-version-gen b/build-aux/bzr-version-gen
index a11eed49bcc697aed23529d9de5d76d8f567b5c2..f22d14fd4228c8040e1809d7bb9be9546d5443f8 100755 (executable)
--- a/build-aux/bzr-version-gen
+++ b/build-aux/bzr-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-scriptversion=2011-08-09.13; # UTC
+scriptversion=2011-08-11.08; # UTC

 
 # Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
 
 # Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 


@@ -37,7 +37,7 @@ REVNO=`bzr revno`
 TAG=`bzr tags -r $REVNO | cut -d' ' -f1`
 if test -z "$TAG"
 then
 TAG=`bzr tags -r $REVNO | cut -d' ' -f1`
 if test -z "$TAG"
 then

-    TAG=`bzr tags -r ..$REVNO | cut -d' ' -f1`
+    TAG=`bzr tags --sort=time -r ..$REVNO | tail -n1 | cut -d' ' -f1`

 
     # No tags yet
     test -z "$TAG" && TAG="unknown"
 
     # No tags yet
     test -z "$TAG" && TAG="unknown"