From owner-cvs-all@FreeBSD.ORG  Tue Apr 15 08:30:12 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7E8E8106566B;
	Tue, 15 Apr 2008 08:30:12 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.freebsd.org (Postfix) with ESMTP id 533058FC0C;
	Tue, 15 Apr 2008 08:30:12 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from fledge.watson.org (fledge.watson.org [209.31.154.41])
	by cyrus.watson.org (Postfix) with ESMTP id 0A4C146B24;
	Tue, 15 Apr 2008 04:30:12 -0400 (EDT)
Date: Tue, 15 Apr 2008 09:30:11 +0100 (BST)
From: Robert Watson <rwatson@FreeBSD.org>
X-X-Sender: robert@fledge.watson.org
To: Warner Losh <imp@FreeBSD.org>
In-Reply-To: <200804150209.m3F29SeR099966@repoman.freebsd.org>
Message-ID: <20080415092841.U14695@fledge.watson.org>
References: <200804150209.m3F29SeR099966@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/mips/conf SENTRY5
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Apr 2008 08:30:12 -0000


On Tue, 15 Apr 2008, Warner Losh wrote:

> imp         2008-04-15 02:09:28 UTC
>
>  FreeBSD src repository
>
>  Modified files:
>    sys/mips/conf        SENTRY5
>  Log:
>  Remove $P4$ tag.  Rumor has it that p4 importer hates it.

What I've done with the Audit files is remove the $ symbols around the tag on 
commit, so that I can still keep a static P4 version in CVS.  You have to 
resolve it as a conflict when it end up back in your P4 branch, but this is 
workable.

Robert N M Watson
Computer Laboratory
University of Cambridge