1
0
Fork 0

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

release/0.4.5
bjarni 2004-08-22 19:40:50 +00:00
parent e328e10bb7
commit efb7c3863f
1 changed files with 6 additions and 1 deletions

View File

@ -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"