Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r586 - trunk/stats-commit.sh

argouml-gen
Discussion topic

Back to topic list

svn commit: r586 - trunk/stats-commit.sh

Reply

Author linus
Full name Linus Tolke
Date 2009-11-12 20:38:13 PST
Message Author: linus
Date: 2009-11-12 20:38:12-0800
New Revision: 586

Modified:
   trunk/stats-commit.sh

Log:
Run svn update only if one of the commit fails.

Modified: trunk/stats-commit.sh
Url: http://argouml-gen.t​igris.org/source/bro​wse/argouml-gen/trun​k/stats-commit.sh?vi​ew=diff&pathrev=​586&r1=585&r​2=586
====================​====================​====================​==================
--- trunk/stats-commit.sh (original)
+++ trunk/stats-commit.sh 2009-11-12 20:38:12-0800
@@ -12,7 +12,8 @@
 then
   echo $(date): Committing all the rest...
   cd argouml-stats/www
- svn commit -m"Committing all the rest" --non-interactive --no-auth-cache
+ svn commit -m"Committing all the rest" --non-interactive --no-auth-cache ||
+ svn update --non-interactive --no-auth-cache --accept=mine-full
   echo $(date): Committing all the rest...done
 else
   echo $(date): Committing all the rest in chunks of $ARG files...
@@ -21,7 +22,7 @@
   awk '/^[AM]/ { print $2; }' |
   xargs --max-args=$ARG --no-run-if-empty \
       svn commit -m"Committing all the rest (in chunks of $ARG files)" \
- --non-interactive --no-auth-cache
+ --non-interactive --no-auth-cache ||
+ svn update --non-interactive --no-auth-cache --accept=mine-full
   echo $(date): Committing all the rest in chunks of $ARG files...done
 fi
-svn update --non-interactive --no-auth-cache --accept=mine-full

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r586 - trunk/stats-commit.sh linus Linus Tolke 2009-11-12 20:38:13 PST
Messages per page: