diff options
Diffstat (limited to 'build_tools')
| -rwxr-xr-x | build_tools/make_version | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build_tools/make_version b/build_tools/make_version index 6176de2c0..a29fe2b32 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -9,6 +9,8 @@ elif [ -d .svn ]; then TAG=0 REV=`svnversion -c ${1} | cut -d: -f2` + + BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1` if [ "${PARTS}" = "trunk" ] then @@ -60,6 +62,6 @@ elif [ -d .svn ]; then then echo ${RESULT} else - echo SVN-${RESULT##-}-r${REV} + echo SVN-${RESULT##-}-r${REV}${BASE:+-${BASE}} fi fi |