Date: Tue, 11 Jul 2006 17:15:47 -0400 From: John Baldwin <jhb@freebsd.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: Re: PERFORCE change 101293 for review Message-ID: <200607111715.47909.jhb@freebsd.org> In-Reply-To: <200607112103.k6BL3FsV004194@repoman.freebsd.org> References: <200607112103.k6BL3FsV004194@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607111715.47909.jhb>