mirror of https://github.com/OpenTTD/OpenTTD
(svn r114) updated svnup.sh to display merged files (blathijs)
parent
e328e10bb7
commit
efb7c3863f
7
svnup.sh
7
svnup.sh
|
@ -8,10 +8,15 @@
|
||||||
Base=`svn info | grep "Revision" | xargs -n 1 | tail -n 1`
|
Base=`svn info | grep "Revision" | xargs -n 1 | tail -n 1`
|
||||||
|
|
||||||
# updates the source
|
# updates the source
|
||||||
svn update
|
svn update > svn.log
|
||||||
|
cat svn.log
|
||||||
|
|
||||||
# if the revision number changed
|
# if the revision number changed
|
||||||
if [ "$Base" -ne "`svn info | grep "Revision" | xargs -n 1 | tail -n 1`" ]; then
|
if [ "$Base" -ne "`svn info | grep "Revision" | xargs -n 1 | tail -n 1`" ]; then
|
||||||
# displays the log changes
|
# displays the log changes
|
||||||
svn log -r HEAD:$(($Base + 1))
|
svn log -r HEAD:$(($Base + 1))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# displays merged files
|
||||||
|
cat svn.log|grep "^G"
|
||||||
|
cat svn.log|grep "^C"
|
Loading…
Reference in New Issue