merge_old_verion: use the ../old-versions/<tree> version

diff --git a/merge_old_version b/merge_old_version
index d0d8403933ff58f262201fef1b2ce2127af5ad7f..02db4b876a7165a9405692acd63ccf5b6beea531 100755 (executable)
--- a/merge_old_version
+++ b/merge_old_version
@@ -15,8 +15,6 @@ fi
 if [ "$1" ]; then
        ver="next-${1#next-}"
        shift
-else
-       ver=$(git tag -l next-\* | sort | tail -n 1)
 fi
 
 tools_dir=$(dirname "$0")
@@ -49,6 +47,13 @@ else
        tree="$stree"
 fi
 
+if [ -z "$ver" ] && [ -f "../old-versions/$tree" ]; then
+       ver=$(cat "../old-versions/$tree")
+fi
+if [ -z "$ver" ]; then
+       ver=$(git tag -l --sort=refname next-\* | tail -n 1)
+fi
+
 rev=$(git show "$ver:Next/SHA1s" | sed -n "s/^$tree\t\t*//p")
 if [ -z "$rev" ]; then
        echo "No previous tree/date ($tree/$ver)" 1>&2