summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/bin/am2
-rw-r--r--version.log6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/bin/am b/src/bin/am
index c8d14be78..df9a71a14 100755
--- a/src/bin/am
+++ b/src/bin/am
@@ -330,7 +330,7 @@ sub do_put() {
$ctrlfile = "$dst/$fhint";
# Grab the current revision number. Clunky way, I know!
# $ver_revision=`$wget -qO - $svnrev`;
- $ver_revision=`svnversion . | cut -d 'M' -f 1`;
+ $ver_revision=`svnversion . | sed "s/.*:\\\(.*\\\)/\\1/" | cut -d 'M' -f 1 | cut -d 'S' -f 1`;
chomp($ver_revision);
unless ($ver_revision =~ /^\d+/ and $ver_revision > 0)
diff --git a/version.log b/version.log
index 8917f887a..106da8090 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="19"
VERSION_EXTRA="-svn"
-VERSION_BUILD="1272"
+VERSION_BUILD="1273"
# $Log$
#
+# BUILD : 1.7.19 (1273)
+# BUGS :
+# NOTES : Updated src/bin/am to now correctly work with multiversioned repositories as reported by svnversion
+#
# BUILD : 1.7.19 (1272)
# BUGS : N/A
# NOTES : Patch provided by teh heinz: [1] Updated the WIN32.txt document a bit [2] Re-worded the CHAN_LEVELS_XOP string in en_us.l