diff options
| author |   Alex Tarkovsky <alextarkovsky@gmail.org> | 2006-07-06 16:34:48 +0000 |
|---|---|---|
| committer | Alex Tarkovsky <alextarkovsky@gmail.org> | 2006-07-06 16:34:48 +0000 |
| commit | ac32d95180c4944435a844fe010b13c7abc59ff5 (patch) | |
| tree | 78ff8436b5702557788fb8a832ea54d394eb0805 /scripts | |
| parent | scripts/sunrise-commit: Replaced a need echo statement (diff) | |
| download | sunrise-ac32d95180c4944435a844fe010b13c7abc59ff5.tar.gz sunrise-ac32d95180c4944435a844fe010b13c7abc59ff5.tar.bz2 sunrise-ac32d95180c4944435a844fe010b13c7abc59ff5.zip | |
scripts/sunrise-commit: When -d option is used make sure svn commit still executes from parent dir(s) if necessary
svn path=/sunrise/; revision=496
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/sunrise-commit | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/sunrise-commit b/scripts/sunrise-commit index d64972751..79f1368cd 100755 --- 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 $? |