From nobody@FreeBSD.org  Thu Oct  4 07:51:59 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 75E6D106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  4 Oct 2012 07:51:59 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 61C848FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  4 Oct 2012 07:51:59 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q947pxGS011883
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 4 Oct 2012 07:51:59 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id q947pxq9011882;
	Thu, 4 Oct 2012 07:51:59 GMT
	(envelope-from nobody)
Message-Id: <201210040751.q947pxq9011882@red.freebsd.org>
Date: Thu, 4 Oct 2012 07:51:59 GMT
From: Chris Petrik <c.petrik.sosa@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] Change CVS IS to SVN Rev in mergemaster
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         172320
>Category:       misc
>Synopsis:       [PATCH] Change CVS IS to SVN Rev in mergemaster
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 04 08:00:28 UTC 2012
>Closed-Date:    Mon Oct 08 06:07:34 UTC 2012
>Last-Modified:  Mon Oct 08 06:07:34 UTC 2012
>Originator:     Chris Petrik
>Release:        FreeBSD 10-CURRENT
>Organization:
none
>Environment:
FreeBSD slappy.nohost 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r241169: Wed Oct  3 22:55:59 CDT 2012     root@slappy.nohost:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
Upgrading my dev box to 10 current and doing mergemaster I noticed that it still mentions CVS ID: when I think it should say SVN Rev: 


>How-To-Repeat:
Small patch as supplied
>Fix:
Not a real problem more of a annoyance :)

Patch attached with submission follows:

Index: mergemaster/mergemaster.sh
===================================================================
--- mergemaster/mergemaster.sh	(revision 241183)
+++ mergemaster/mergemaster.sh	(working copy)
@@ -1105,7 +1105,7 @@
 
     case "${CVSID2}" in
     "${CVSID1}")
-      echo " *** Temp ${COMPFILE} and installed have the same CVS Id, deleting"
+      echo " *** Temp ${COMPFILE} and installed have the same SVN Rev., deleting"
       rm "${COMPFILE}"
       ;;
     esac


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Fri Oct 5 03:50:50 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172320 
State-Changed-From-To: open->analyzed 
State-Changed-By: dougb 
State-Changed-When: Fri Oct 5 04:25:55 UTC 2012 
State-Changed-Why:  

Reasonable idea 


Responsible-Changed-From-To: eadler->dougb 
Responsible-Changed-By: dougb 
Responsible-Changed-When: Fri Oct 5 04:25:55 UTC 2012 
Responsible-Changed-Why:  

My script 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172320 
State-Changed-From-To: analyzed->patched 
State-Changed-By: dougb 
State-Changed-When: Fri Oct 5 05:01:49 UTC 2012 
State-Changed-Why:  

Patched in r241218 (with a different solution). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172320 
State-Changed-From-To: patched->closed 
State-Changed-By: dougb 
State-Changed-When: Mon Oct 8 06:07:15 UTC 2012 
State-Changed-Why:  

MFC complete.  

http://www.freebsd.org/cgi/query-pr.cgi?pr=172320 
>Unformatted:
