(svn r114) updated svnup.sh to display merged files (blathijs)

1 files changed, 6 insertions, 1 deletions

diff --git a/svnup.sh b/svnup.sh
index 15a6071b4..bca19ec06 100644
--- a/svnup.sh
+++ b/svnup.sh
@@ -8,10 +8,15 @@
 Base=`svn info | grep "Revision" | xargs -n 1 | tail -n 1`
 
 # updates the source
-svn update
+svn update > svn.log
+cat svn.log
 
 # if the revision number changed
 if [ "$Base" -ne "`svn info | grep "Revision" | xargs -n 1 | tail -n 1`" ]; then
 # displays the log changes
 svn log -r HEAD:$(($Base + 1))
 fi
+
+# displays merged files
+cat svn.log|grep "^G"
+cat svn.log|grep "^C"
\ No newline at end of file