From owner-cvs-src@FreeBSD.ORG Thu Oct 7 21:52:49 2004 Return-Path: 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 4D0AA16A4CE; Thu, 7 Oct 2004 21:52:49 +0000 (GMT) Received: from mx-out-02.forthnet.gr (mx-out.forthnet.gr [193.92.150.6]) by mx1.FreeBSD.org (Postfix) with ESMTP id A586A43D4C; Thu, 7 Oct 2004 21:52:47 +0000 (GMT) (envelope-from dds@aueb.gr) Received: from mx-av-03.forthnet.gr (mx-av.forthnet.gr [193.92.150.27]) i97Lqjne000737; Fri, 8 Oct 2004 00:52:45 +0300 Received: from mx-as-02.forthnet.gr (mx-as.forthnet.gr [193.92.150.226]) i97LqjYa015028; Fri, 8 Oct 2004 00:52:45 +0300 Received: from forthnet.gr (athmta03.forthnet.gr [193.92.150.22]) i97Lqj6Y020277; Fri, 8 Oct 2004 00:52:45 +0300 Received: from [192.168.136.16] (ppp10-adsl-131.ath.forthnet.gr [212.54.221.131]) by forthnet.gr (8.12.11/8.12.11) with ESMTP id i97LqiHd021451; Fri, 8 Oct 2004 00:52:44 +0300 Message-ID: <4165BAAD.4080401@aueb.gr> Date: Fri, 08 Oct 2004 00:52:45 +0300 From: Diomidis Spinellis User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.3) Gecko/20040910 X-Accept-Language: en-us, en, el, de MIME-Version: 1.0 To: "M. Warner Losh" References: <200410071621.i97GL3lu029620@repoman.freebsd.org> <41658491.3070604@aueb.gr> <20041007.121859.43504085.imp@bsdimp.com> In-Reply-To: <20041007.121859.43504085.imp@bsdimp.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Flag: NO cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: peter@freebsd.org cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/sys pbioio.h src/sys/i386/isa pbio.csrc/sys/conf files.i386 src/sys/i386/conf NOTES X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Oct 2004 21:52:49 -0000 M. Warner Losh wrote: > In message: <41658491.3070604@aueb.gr> > Diomidis Spinellis writes: > : Warner Losh wrote: > : > Added files: > : > sys/sys pbioio.h > : > sys/i386/isa pbio.c > : > Log: > : > Port pbio to HEAD. > : > > : > OK'd by: dds > : > : I now see that my initial commit to RELENG_4 and Warner's subsequent > : blitzport to HEAD has resulted into two disjoint file sets in the > : repository. I had not forseen this problem. Since this problem started > : from me, I am willing to redo the commits starting from HEAD and follow > : with the MFCs, if the CVS meisters are willing to do the required repo > : surgery, removing sys/sys/pbioio, sys/i386/isa/pbio.c and > : share/man/man4/man4.i386/pbio.4 > > I'm not sure I understand this issue. cvsup just now shows that the > files moved from Attic up a level. There's a weird 1.1 rev, but > that's the only problem I see. Can you explain more what you are > seeing that makes them disjoint? By reading the commit messages I thought that CVS kept one file in the Attic, and one outside, because both commits were marked as (new). Apparently CVS is more clever than that: revision 1.2 date: 2004/10/07 16:25:21; author: imp; state: Exp; lines: +181 -0 ---------------------------- revision 1.1 date: 2004/10/07 11:54:00; author: dds; state: dead; branches: 1.1.2; file pbio.4 was initially added on branch RELENG_4. ---------------------------- revision 1.1.2.1 date: 2004/10/07 11:54:00; author: dds; state: Exp; lines: +181 -0 The only problem I see is that the file body appears to be stored twice in the repository, starting from an empty 1.1. revision. I guess we can ignore it and move on. Diomidis