[svn-commits] qwell: trunk r518 - in /trunk: ./ Makefile

[SVN commits to the Digium repositories]

Author: qwell
Date: Wed Jan 16 12:06:29 2008
New Revision: 518

URL: http://svn.digium.com/view/libpri?view=rev&rev=518
Log:
Add logging for 'make update' command (also fixes updates in some places).  Issue #11766, initial patch by jmls.

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jan 16 12:06:29 2008
@@ -2,3 +2,4 @@
 *.lo
 libpri.so.1.0
 pritest
+update.log

Modified: trunk/Makefile
URL: http://svn.digium.com/view/libpri/trunk/Makefile?view=diff&rev=518&r1=517&r2=518
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jan 16 12:06:29 2008
@@ -71,7 +71,16 @@
 update:
 	@if [ -d .svn ]; then \
 		echo "Updating from Subversion..." ; \
-		svn update -q; \
+		fromrev="`svn info | $(AWK) '/Revision: / {print $$2}'`"; \
+		svn update | tee update.out; \
+		torev="`svn info | $(AWK) '/Revision: / {print $$2}'`"; \
+		echo "`date`  Updated from revision $${fromrev} to $${torev}." >> update.log; \
+		rm -f .version; \
+		if [ `grep -c ^C update.out` -gt 0 ]; then \
+			echo ; echo "The following files have conflicts:" ; \
+			grep ^C update.out | cut -b4- ; \
+		fi ; \
+		rm -f update.out; \
 	else \
 		echo "Not under version control";  \
 	fi