From owner-freebsd-questions@FreeBSD.ORG Wed Oct 29 09:50:48 2003 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A166716A4E8 for ; Wed, 29 Oct 2003 09:50:48 -0800 (PST) Received: from bart.bartsite.com (bart.bartsite.com [64.8.202.227]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8485A43FA3 for ; Wed, 29 Oct 2003 09:50:47 -0800 (PST) (envelope-from dlee@bart.bartsite.com) Received: from bart.bartsite.com (dlee@localhost [127.0.0.1]) by bart.bartsite.com (8.12.8/8.12.8) with ESMTP id h9THohuq095658 for ; Wed, 29 Oct 2003 12:50:43 -0500 (EST) (envelope-from dlee@bart.bartsite.com) Received: (from dlee@localhost) by bart.bartsite.com (8.12.8/8.12.8/Submit) id h9THohSL095657 for freebsd-questions@freebsd.org; Wed, 29 Oct 2003 12:50:43 -0500 (EST) (envelope-from dlee) Date: Wed, 29 Oct 2003 12:50:43 -0500 From: Doug Lee To: freebsd-questions@freebsd.org Message-ID: <20031029125043.A92160@bart.bartsite.com> Mail-Followup-To: Doug Lee , freebsd-questions@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i Organization: Bartimaeus Group X-MailScanner-Information: Please contact the ISP for more information X-MailScanner: Found to be clean Subject: Will CVS let me pull in a revision between two existing ones? X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2003 17:50:48 -0000 I'm finally setting up a CVS repository for work we do at my company, and after piling through cvs.info and bouncing around in cvs(1) and through a number of CVS-related web sites, I think I've found answers to all of my questions but one: Can I import (or otherwise pull in) a revision of sources that is chronologically between two revisions already in the repository? The reason I want to do this is that we have source files embedded in projects which sprang from, eventually returned to, but are not identical to any revision in our local library of code modules. Example of development cycle: While working on a project, a code file I'll call file1 is written. It becomes useful in some similar form in several projects, so we take the time to write a generic version and put it in the code library. Sometime later, while working on another project, I find I have to update it within that project. The update turns out to be useful elsewhere, so it later gets merged by hand back into the library. (Yes, I know...this whole scenario is the whole purpose of systems like CVS; but of all the things CVS can do, time regression (so I can have managed all this right the first time) isn't one of them.) If I can indeed slip a mid-way revision in somehow, I can start building the repository immediately; otherwise, I fear I'll have to do a massive file organization first to line up all the revisions of individual files. In the docs, I saw a (dangerous but possible) way to remove a mid-way revision, but not a way to make one. I'm up for editing repository files if I must for this, but I want the final result to look like I committed the revisions in chronological order. Due to the way CVS numbers revisions, I doubt what I want can be done, at least without a major repository overhaul; but I figure it won't hurt to ask anyway. Thanks for any help. -- Doug Lee, Access Technology Programmer, Bartimaeus Group mailto:doug@bartsite.com http://www.bartsite.com "While they were saying among themselves it cannot be done, it was done." --Helen Keller