summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2004-08-22 19:40:50 +0000
committerbjarni <bjarni@openttd.org>2004-08-22 19:40:50 +0000
commitefb7c3863ff07975490988b64943a129b446e57e (patch)
tree70ec4ff964862797a95a62e50c56a4a0c0ec3f95
parente328e10bb7dc3f3ba9626fd755b8d27b3f25acd9 (diff)
downloadopenttd-efb7c3863ff07975490988b64943a129b446e57e.tar.xz
(svn r114) updated svnup.sh to display merged files (blathijs)
-rw-r--r--svnup.sh7
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