From 682b914cd7f5eacf21f5797ad930ab42c3871456 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Wed, 16 Jan 2008 18:06:29 +0000
Subject: [PATCH] Add logging for 'make update' command (also fixes updates in
 some places).  Issue #11766, initial patch by jmls.

git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@518 2fbb986a-6c06-0410-b554-c9c1f0a7f128
---
 Makefile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 05d985e..e09ceab 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,16 @@ all: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
 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