diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-04-19 14:09:58 +0200 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-04-19 14:09:58 +0200 |
| commit | f2f52b9f201f8ff425fb5e7f450170ec5d7b5002 (patch) | |
| tree | 3b66c9ca8ecf14801fb4c2af18330df2c98a6c4d | |
| parent | f035252a14afd9a78553232a7ca916bf95b6d1df (diff) | |
| download | deployment-f2f52b9f201f8ff425fb5e7f450170ec5d7b5002.tar.gz deployment-f2f52b9f201f8ff425fb5e7f450170ec5d7b5002.tar.bz2 deployment-f2f52b9f201f8ff425fb5e7f450170ec5d7b5002.zip | |
programmatically ignoring conflicts in SVN when updating gnunet
| -rwxr-xr-x | taler-build/update_gnunet.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/taler-build/update_gnunet.sh b/taler-build/update_gnunet.sh index b6b7f48..ba9187c 100755 --- 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 \ |