scripts/sunrise-commit: When -d option is used make sure svn commit still executes...

svn path=/sunrise/; revision=496

diff --git a/scripts/sunrise-commit b/scripts/sunrise-commit
index d649727514a8b38d00e39308a5effbd61fe28f2b..79f1368cd623323778ca4f8b2dcd662f21d624af 100755 (executable)
--- a/scripts/sunrise-commit
+++ b/scripts/sunrise-commit
@@ -119,9 +119,8 @@ svn_commit() {
 
 svn_up() {
        if [[ "$opt_noupdate" == "0" ]] ; then
-               while [[ "$(echo `svn status`)" =~ 'A.+? \.' ]] ; do
+               for (( i=num_new_dirs ; i > 0 ; i-- )) ; do
                        pushd .. >/dev/null
-                       (( num_new_dirs++ ))
                done
 
                ebegin "Updating working copy to latest version from repository"
@@ -224,8 +223,14 @@ if [[ -z "$*" ]] ; then
        exit 1
 fi
 
+while [[ "$(echo `svn status`)" =~ 'A.+? \.' ]] ; do
+       (( num_new_dirs++ ))
+done
+
 svn_up || exit $?
+
 [[ ! -e metadata.xml ]] && cp ../../skel.metadata.xml metadata.xml >/dev/null 2>&1
+
 changelog_append "$*" || exit $?
 create_digests || exit $?
 svn_add || exit $?