altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Update the mkrelease script to not automatically create new branch/N.NN branches off trunk when releasing from trunk.

Browse source 
- Legacy-Id: 2368
This commit is contained in:
Henrik Levkowetz 2010-07-21 13:30:40 +00:00
parent 10666bde7a
commit fe43b90b7d
1 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
test/mkrelease
View file

@ -209,22 +209,6 @@ $do sed -i -r -e 's/^DEBUG *= *.*$/DEBUG = True/' \
note "\nCommitting the updated version and deployment settings"
$do svn commit $VERFILE $SETTINGS -m "Set version info and settings back to development mode"
# if SRC is 'trunk', then also create a new branch
if [ $SRC = "trunk" ]; then
if svn info $REPO/branch/$VER 2>&1 | grep -q "Not a valid URL"; then
note "\nCreating new branch 'branch/$VER' from $SRC"
$do svn cp $REPO/$SRC $REPO/branch/$VER -m "Creating new branch 'branch/$VER' from $SRC"
fi
note "\nUpdating version and revision info on trunk"
$do sed -i -r -e "/^__version__/s/\"[0-9.]*\"/\"$MAJOR.xx-trunk\"/" \
-e "/^__rev__/s/\"\\\$Rev: (.*) \\\$\"/\"\$Rev:\$ (dev) Latest release: Rev. \1 \"/" \
$VERFILE
note "Commit version information '$MAJOR.xx-trunk'"
$do svn commit $VERFILE $SETTINGS -m "Set version of the trunk to $MAJOR.xx-trunk after branching off $VER"
fi
$do svn update
echo "
@ -244,7 +228,7 @@ Regards,
Henrik
(via the mkrelease script)
" | mail -s "New datatracker release: v$VER" -c henrik@levkowetz.com -c glen@amsl.com -c fenner@fenron.net -c pasi.eronen@nokia.com -c rjs@nostrum.com -c housley@vigilsec.com codesprints@ietf.org
" | $do mail -s "New datatracker release: v$VER" -c henrik@levkowetz.com -c glen@amsl.com -c fenner@fenron.net -c pasi.eronen@nokia.com -c rjs@nostrum.com -c housley@vigilsec.com codesprints@ietf.org
toolsfeed control changelog /www/tools.ietf.org/tools/atomfeed.xml
toolpush /www/tools.ietf.org/tools/atomfeed.xml
$do toolsfeed control changelog /www/tools.ietf.org/tools/atomfeed.xml
$do toolpush /www/tools.ietf.org/tools/atomfeed.xml