From owner-p4-projects@FreeBSD.ORG  Tue Jul 11 21:16:17 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EC96016A51E; Tue, 11 Jul 2006 21:16:16 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9B3AD16A51B
	for <perforce@freebsd.org>; Tue, 11 Jul 2006 21:16:16 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net
	[66.23.211.162])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9656043D5F
	for <perforce@freebsd.org>; Tue, 11 Jul 2006 21:16:14 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1])
	(authenticated bits=0)
	by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k6BLGDqr077674
	for <perforce@freebsd.org>; Tue, 11 Jul 2006 17:16:13 -0400 (EDT)
	(envelope-from jhb@freebsd.org)
From: John Baldwin <jhb@freebsd.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Date: Tue, 11 Jul 2006 17:15:47 -0400
User-Agent: KMail/1.9.1
References: <200607112103.k6BL3FsV004194@repoman.freebsd.org>
In-Reply-To: <200607112103.k6BL3FsV004194@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200607111715.47909.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by
	milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]);
	Tue, 11 Jul 2006 17:16:13 -0400 (EDT)
X-Virus-Scanned: ClamAV 0.87.1/1592/Tue Jul 11 16:40:37 2006 on
	server.baldwin.cx
X-Virus-Status: Clean
X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,BAYES_00 
	autolearn=ham version=3.1.0
X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx
Cc: 
Subject: Re: PERFORCE change 101293 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Jul 2006 21:16:17 -0000

On Tuesday 11 July 2006 17:03, John Baldwin wrote:
> http://perforce.freebsd.org/chv.cgi?CH=101293
> 
> Change 101293 by jhb@jhb_mutex on 2006/07/11 21:02:46
> 
> 	Attempt to fix a mismerge.
> 
> Affected files ...
> 
> .. //depot/projects/smpng/sys/bsm/audit_record.h#5 edit
> 
> Differences ...
> 
> ==== //depot/projects/smpng/sys/bsm/audit_record.h#5 (text+ko) ====
> 
> @@ -30,7 +30,7 @@
>   *
>   * @APPLE_BSD_LICENSE_HEADER_END@
>   *
> - * $P4: //depot/projects/smpng/sys/bsm/audit_record.h#4 $
> + * $P4: //depot/projects/smpng/sys/bsm/audit_record.h#5 $

p4 hates me.  I keep getting a diff relative to //depot/vendor/freebsd/...
because the CVS version has different P4 tag in it. :(

-- 
John Baldwin