From owner-svn-src-all@FreeBSD.ORG  Wed Sep 23 14:48:13 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 905A01065679;
	Wed, 23 Sep 2009 14:48:13 +0000 (UTC)
	(envelope-from mlaier@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F73C8FC13;
	Wed, 23 Sep 2009 14:48:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8NEmDmh066500;
	Wed, 23 Sep 2009 14:48:13 GMT (envelope-from mlaier@svn.freebsd.org)
Received: (from mlaier@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8NEmDDr066498;
	Wed, 23 Sep 2009 14:48:13 GMT (envelope-from mlaier@svn.freebsd.org)
Message-Id: <200909231448.n8NEmDDr066498@svn.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Wed, 23 Sep 2009 14:48:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197433 - head/sys/conf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Sep 2009 14:48:13 -0000

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