svn commit: r197433 - head/sys/conf

[Max Laier]

Author: mlaier
Date: Wed Sep 23 14:48:13 2009
New Revision: 197433
URL: http://svn.freebsd.org/changeset/base/197433

Log:
  Improve on r197334:
  Find the most recently merged svn revision, too. If we get a svn revision
  that matches HEAD use rXXX=GIT otherwise use rXXX+GIT.
  
  Submitted by:	avg
  MFC after:	3 days
  X-MFC:		not stable/8 before 8.0

Modified:
  head/sys/conf/newvers.sh

Modified: head/sys/conf/newvers.sh
==============================================================================
--- head/sys/conf/newvers.sh	Wed Sep 23 14:23:09 2009	(r197432)
+++ head/sys/conf/newvers.sh	Wed Sep 23 14:48:13 2009	(r197433)
@@ -114,9 +114,16 @@ case "$d" in
 		svn=`$git_cmd svn find-rev $git 2>/dev/null`
 		if [ -n "$svn" ] ; then
 			svn=" r${svn}"
-			git="-${git}"
+			git="=${git}"
 		else
-			git=" ${git}"
+			svn=`$git_cmd log | fgrep 'git-svn-id:' | head -1 | \
+			     sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p'`
+			if [ -n $svn ] ; then
+				svn=" r${svn}"
+				git="+${git}"
+			else
+				git=" ${git}"
+			fi
 		fi
 		if $git_cmd --work-tree=${SRCDIR} diff-index \
 		    --name-only HEAD | read dummy; then