From fd04791f5b42c3f65519d55262ac4d4660a40f1d Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Tue, 8 Apr 2008 01:46:29 -0500 Subject: archrelease modifications to auto-commit handling Signed-off-by: Aaron Griffin --- archrelease | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/archrelease b/archrelease index 01c1472..59b85ec 100755 --- a/archrelease +++ b/archrelease @@ -1,19 +1,24 @@ #!/bin/bash if [ "$1" = "" ]; then - echo "Usage: archrelease " - exit 1 + echo "Usage: archrelease " + exit 1 fi if [ ! -d ../repos/$1 ]; then - pushd .. - svn copy trunk ../repos/$1 - popd + pushd .. + svn copy trunk repos/$1 + svn commit -m "archrelease: new repo $1" + popd else - svnmerge merge ../repos/$1 + svnmerge merge ../repos/$1 + pushd .. + if [ -f trunk/svnmerge-commit-message.txt ]; then + svn commit -F trunk/svnmerge-commit-message.txt + rm trunk/svnmerge-commit-message.txt + else + echo "Nothing to commit" + fi + popd fi -pushd .. -svn commit -F trunk/svnmerge-commit-message.txt -popd -rm svnmerge-commit-message.txt -- cgit v1.2.3-70-g09d2