From owner-freebsd-hackers@FreeBSD.ORG Tue Aug 7 07:25:00 2007 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12E2316A419; Tue, 7 Aug 2007 07:25:00 +0000 (UTC) (envelope-from peter@wemm.org) Received: from overcee.wemm.org (unknown [IPv6:2001:5a8:4:2140:21b:fcff:fe24:feef]) by mx1.freebsd.org (Postfix) with ESMTP id D219913C4D9; Tue, 7 Aug 2007 07:24:59 +0000 (UTC) (envelope-from peter@wemm.org) Received: from overcee.wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (8.14.1/8.14.1) with ESMTP id l777OkEF053719; Tue, 7 Aug 2007 00:24:46 -0700 (PDT) (envelope-from peter@wemm.org) Received: from localhost (localhost [[UNIX: localhost]]) by overcee.wemm.org (8.14.1/8.14.1/Submit) id l777OjOS053718; Tue, 7 Aug 2007 00:24:45 -0700 (PDT) (envelope-from peter@wemm.org) X-Authentication-Warning: overcee.wemm.org: peter set sender to peter@wemm.org using -f From: Peter Wemm To: Xin LI Date: Tue, 7 Aug 2007 00:24:45 -0700 User-Agent: KMail/1.9.6 References: <46A8865D.2000509@delphij.net> In-Reply-To: <46A8865D.2000509@delphij.net> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200708070024.45719.peter@wemm.org> X-Mailman-Approved-At: Tue, 07 Aug 2007 11:31:53 +0000 Cc: freebsd-hackers@freebsd.org, Xin LI Subject: Re: cvs: how to put vendor-deleted file into Attic? X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Aug 2007 07:25:00 -0000 On Thursday 26 July 2007, Xin LI wrote: > Hi, > > While maintaining some third party contributed software packages I > ran into a problem where, say, if I remove a file from the vendor > branch (the file was never dragged off the vendor branch), it does > not appear in Attic. > > Is there a way to move it into Attic (presumably this would give > better checkout speed for -HEAD)? > > Cheers, The way you do this is: cvs checkout -r1.1.1 contrib/whatever cvs rm files cvs commit This puts the deletion on the 1.1.1 "vendor" branch. HEAD picks it up automatically, and if the file becomes "alive" again in the future, HEAD continues to track it. And there is metadata recorded to track when it was deleted and came back alive etc. -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5