"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "devscripts/postrelease" between
cheetah3-3.2.4.tar.gz and cheetah3-3.2.5.tar.gz

About: Cheetah3 is a template engine and code generation tool for e.g. for Web development or Java, SQL, LaTeX, form email ... (written in Python).

postrelease  (cheetah3-3.2.4):postrelease  (cheetah3-3.2.5)
#! /bin/sh #! /bin/sh
tag="`python setup.py --version`" && tag="`python setup.py --version`" &&
. `dirname $0`/split.sh && . `dirname $0`/split.sh &&
split_tag $tag split_tag $tag
if [ $micro -eq 0 -a $state = final ]; then if [ $micro -eq 0 -a $state = final ] &&
if git branch --merged master | grep -Fqw maint; then git branch --merged master | grep -Fqw maint; then
git checkout maint && git checkout maint &&
git merge --ff-only master && git merge --ff-only master &&
git checkout master git checkout master
else: else:
git checkout master && git checkout master &&
git merge --strategy=ours -m 'Null-merge branch "maint"' maint git merge --ff-only maint ||
fi git merge --strategy=ours -m 'Null-merge branch "maint"' maint
fi && fi &&
git checkout $tag~ ANNOUNCE.rst && git checkout $tag~ ANNOUNCE.rst &&
`git var GIT_EDITOR` ANNOUNCE.rst docs/news.rst Cheetah/Version.py README.rst se tup.cfg SetupConfig.py && `git var GIT_EDITOR` ANNOUNCE.rst docs/news.rst Cheetah/Version.py README.rst se tup.cfg SetupConfig.py &&
exec git commit --message="Prepare for the next release" ANNOUNCE.rst docs/news. rst Cheetah/Version.py README.rst setup.cfg SetupConfig.py exec git commit --message="Prepare for the next release" ANNOUNCE.rst docs/news. rst Cheetah/Version.py README.rst setup.cfg SetupConfig.py
 End of changes. 1 change blocks. 
9 lines changed or deleted 9 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)