From owner-cvs-src@FreeBSD.ORG  Sun Aug  1 20:50:13 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id B0EBA16A4CE; Sun,  1 Aug 2004 20:50:13 +0000 (GMT)
Received: from smtp3.server.rpi.edu (smtp3.server.rpi.edu [128.113.2.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4A4E543D5C; Sun,  1 Aug 2004 20:50:13 +0000 (GMT)
	(envelope-from drosih@rpi.edu)
Received: from [128.113.24.47] (gilead.netel.rpi.edu [128.113.24.47])
	by smtp3.server.rpi.edu (8.13.0/8.13.0) with ESMTP id i71KoAX8010902;
	Sun, 1 Aug 2004 16:50:10 -0400
Mime-Version: 1.0
X-Sender: drosih@mail.rpi.edu
Message-Id: <p06110433bd33078b3fa2@[128.113.24.47]>
In-Reply-To: <200408012045.i71KjtFX087582@repoman.freebsd.org>
References: <200408012045.i71KjtFX087582@repoman.freebsd.org>
Date: Sun, 1 Aug 2004 16:50:11 -0400
To: Garance A Drosehn <gad@FreeBSD.org>, src-committers@FreeBSD.org,
	cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
From: Garance A Drosihn <drosih@rpi.edu>
Content-Type: text/plain; charset="us-ascii" ; format="flowed"
X-Scanned-By: CanIt (www . canit . ca)
Subject: Re: cvs commit: src/usr.bin/patch - Imported sources
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Aug 2004 20:50:13 -0000

At 8:45 PM +0000 8/1/04, Garance A Drosehn wrote:
>
>   Vendor Tag:	OPENBSD
>   Release Tags:	OpenBSD_20040801
>
>   N src/usr.bin/patch/backupfile.c
>   N src/usr.bin/patch/backupfile.h
>   C src/usr.bin/patch/common.h
>   C src/usr.bin/patch/inp.c
>   C src/usr.bin/patch/inp.h
>   C src/usr.bin/patch/Makefile
>   C src/usr.bin/patch/patch.1
>   C src/usr.bin/patch/patch.c
>   N src/usr.bin/patch/pathnames.h
>   C src/usr.bin/patch/pch.c
>   C src/usr.bin/patch/pch.h
>   C src/usr.bin/patch/README
>   C src/usr.bin/patch/util.c
>   C src/usr.bin/patch/util.h
>
>   11 conflicts created by this import.

Hrm.  That wasn't what I was expecting to happen...
Sigh.

-- 
Garance Alistair Drosehn            =   gad@gilead.netel.rpi.edu
Senior Systems Programmer           or  gad@freebsd.org
Rensselaer Polytechnic Institute    or  drosih@rpi.edu