equal
deleted
inserted
replaced
6 |
6 |
7 # reads what version you have now |
7 # reads what version you have now |
8 Base=`svn info | grep "Revision" | xargs -n 1 | tail -n 1` |
8 Base=`svn info | grep "Revision" | xargs -n 1 | tail -n 1` |
9 |
9 |
10 # updates the source |
10 # updates the source |
11 svn update |
11 svn update > svn.log |
|
12 cat svn.log |
12 |
13 |
13 # if the revision number changed |
14 # if the revision number changed |
14 if [ "$Base" -ne "`svn info | grep "Revision" | xargs -n 1 | tail -n 1`" ]; then |
15 if [ "$Base" -ne "`svn info | grep "Revision" | xargs -n 1 | tail -n 1`" ]; then |
15 # displays the log changes |
16 # displays the log changes |
16 svn log -r HEAD:$(($Base + 1)) |
17 svn log -r HEAD:$(($Base + 1)) |
17 fi |
18 fi |
|
19 |
|
20 # displays merged files |
|
21 cat svn.log|grep "^G" |
|
22 cat svn.log|grep "^C" |