From owner-freebsd-bugs@FreeBSD.ORG Thu Oct 4 08:00:29 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1A001106564A for ; Thu, 4 Oct 2012 08:00:29 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CD87C8FC14 for ; Thu, 4 Oct 2012 08:00:28 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9480S2f014515 for ; Thu, 4 Oct 2012 08:00:28 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9480Sde014513; Thu, 4 Oct 2012 08:00:28 GMT (envelope-from gnats) Resent-Date: Thu, 4 Oct 2012 08:00:28 GMT Resent-Message-Id: <201210040800.q9480Sde014513@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chris Petrik Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75E6D106566C for ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/172320: [PATCH] Change CVS IS to SVN Rev in mergemaster X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Oct 2012 08:00:29 -0000 >Number: 172320 >Category: misc >Synopsis: [PATCH] Change CVS IS to SVN Rev in mergemaster >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Oct 04 08:00:28 UTC 2012 >Closed-Date: >Last-Modified: >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: >Unformatted: