Use local information to determine if a commit is needed
This commit is contained in:
parent
849e6c6de5
commit
53a864a5aa
20
archrelease
20
archrelease
|
@ -15,7 +15,7 @@ if [ "$(basename $(readlink -f .))" != 'trunk' ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(svn diff)" != '' ]; then
|
if [ ! -z "$(svn status -q)" ]; then
|
||||||
echo 'archrelease: You have not committed your changes yet!'
|
echo 'archrelease: You have not committed your changes yet!'
|
||||||
echo ' Please run "svn commit" first'
|
echo ' Please run "svn commit" first'
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -23,18 +23,20 @@ fi
|
||||||
|
|
||||||
echo -n 'releasing package...'
|
echo -n 'releasing package...'
|
||||||
pushd .. >/dev/null
|
pushd .. >/dev/null
|
||||||
url=$(svn info | grep URL)
|
|
||||||
url="${url##*URL: }"
|
trunk=$(LANG=C svn info trunk | grep 'Last Changed Rev:' | awk '{ print $4 }')
|
||||||
if [ -z "$(svn diff ${url}/trunk ${url}/repos/${1} 2>/dev/null)" -a $? -eq 0 ]; then
|
repo=$(LANG=C svn info "repos/${1}" 2>/dev/null | grep 'Last Changed Rev:' | awk '{ print $4 }')
|
||||||
|
if [[ ${trunk} -le ${repo} ]]; then
|
||||||
echo 'already done'
|
echo 'already done'
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
if [ -d repos/$1 ]; then
|
|
||||||
svn rm --force -q repos/$1
|
if [ -d "repos/${1}" ]; then
|
||||||
svn commit -q -m "archrelease: remove $1"
|
svn rm --force -q "repos/${1}"
|
||||||
|
svn commit -q -m "archrelease: remove ${1}"
|
||||||
fi
|
fi
|
||||||
svn copy -q -r HEAD trunk repos/$1
|
svn copy -q -r HEAD trunk "repos/${1}"
|
||||||
svn commit -q -m "archrelease: copy trunk to $1"
|
svn commit -q -m "archrelease: copy trunk to ${1}"
|
||||||
popd >/dev/null
|
popd >/dev/null
|
||||||
echo 'done'
|
echo 'done'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue