taler-deployment

commit f2f52b9f201f8ff425fb5e7f450170ec5d7b5002
parent f035252a14afd9a78553232a7ca916bf95b6d1df
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Tue, 19 Apr 2016 14:09:58 +0200

programmatically ignoring conflicts in SVN when updating gnunet

Diffstat:
M
taler-build/update_gnunet.sh
 | 
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/taler-build/update_gnunet.sh b/taler-build/update_gnunet.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 cd $HOME/gnunet/ && \
+  svn revert -R . && \
   svn update && \
   ./bootstrap \
   ./configure --prefix=$HOME/local --enable-logging=verbose \