Use the correct branch integrated property when generating the version string
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@181542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
f1ae8e9f3b
commit
b782f28fa9
|
@ -10,7 +10,12 @@ elif [ -d .svn ]; then
|
||||||
|
|
||||||
REV=`svnversion -c ${1} | cut -d: -f2`
|
REV=`svnversion -c ${1} | cut -d: -f2`
|
||||||
|
|
||||||
BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1`
|
INTEGRATED=`LANG=C svn pg automerge-propname ${1}`
|
||||||
|
if [ -z "${INTEGRATED}" ] ; then
|
||||||
|
INTEGRATED=svnmerge-integrated
|
||||||
|
fi
|
||||||
|
|
||||||
|
BASE=`LANG=C svn pg ${INTEGRATED} ${1} | cut -d: -f1`
|
||||||
|
|
||||||
if [ "${PARTS}" = "trunk" ] ; then
|
if [ "${PARTS}" = "trunk" ] ; then
|
||||||
echo SVN-trunk-r${REV}
|
echo SVN-trunk-r${REV}
|
||||||
|
|
Loading…
Reference in New Issue