From owner-cvs-src@FreeBSD.ORG Thu Oct 7 18:20:38 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 947B216A4D1; Thu, 7 Oct 2004 18:20:24 +0000 (GMT) Received: from harmony.village.org (rover.village.org [168.103.84.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF4C943D46; Thu, 7 Oct 2004 18:20:23 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (harmony.village.org [10.0.0.6]) by harmony.village.org (8.13.1/8.13.1) with ESMTP id i97IHIUj040989; Thu, 7 Oct 2004 12:17:18 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Thu, 07 Oct 2004 12:18:59 -0600 (MDT) Message-Id: <20041007.121859.43504085.imp@bsdimp.com> To: dds@aueb.gr From: "M. Warner Losh" In-Reply-To: <41658491.3070604@aueb.gr> References: <200410071621.i97GL3lu029620@repoman.freebsd.org> <41658491.3070604@aueb.gr> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit 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.c src/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 18:20:40 -0000 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? Warner