Date: Mon, 18 May 1998 18:32:06 +0200 From: Eivind Eklund <eivind@yes.no> To: Chuck Robey <chuckr@glue.umd.edu> Cc: freebsd-current@FreeBSD.ORG Subject: Re: Replacing via cvs Message-ID: <19980518183206.45376@follo.net> In-Reply-To: <Pine.BSF.3.96.980518105642.29583A-100000@localhost>; from Chuck Robey on Mon, May 18, 1998 at 11:01:07AM -0400 References: <19980518114905.06280@follo.net> <Pine.BSF.3.96.980518105642.29583A-100000@localhost>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, May 18, 1998 at 11:01:07AM -0400, Chuck Robey wrote: > On Mon, 18 May 1998, Eivind Eklund wrote: > > > On Sun, May 17, 1998 at 11:03:59PM -0400, Chuck Robey wrote: > > > I've been holding off changing out part of groff, because I'm not sure > > > of the method to do it. I know how to apply diffs, and I know how to > > > initially import stuff, but I don't know how to completely replace a > > > directory, without applying humongous diffs, or deleting/adding. Could > > > someone let me know how I go about doing this? > > > > You don't. You may ask Peter to blow the directory from the > > repository, but I doubt he will want to. > > > > Is this based off the same version, or is it completely different > > source? You may want to do an import of the new version, and then > > put your own source on top of that afterwards... > > That's precisely what I'm looking for instructions how to do. In this > case, it's based on the existing stuff, but with so many changes, I > think that just applying a diff will double the size of the change. If > it was an initial import, I'd know how to handle that, but doing an > import of a piece of software whose name (and module name) already > exists, I don't know how to do that. cvs import <where in repository to import> <which branch to import on> <what version to import> ... then commit any changes to the main branch. Basically, in your case (I'm assuming groff version 1.11a, which seems to be the latest). % cd <where-you-have-virgin-version-of-groff-mm> % cvs import src/contrib/groff/mm FSF v1_11a % cd <where-you-have-your-merged-versions> % cvs update ... resolve any conflicts (probably none) ... % cvs commit Of course, you're probably better off using easy-import than doing 'cvs import' yourself unless you know exactly what you're doing and don't want any seatbelts. I have a version of easy-import for remote use; yell if you want a copy. I'm using 'cvs import' in the examples because I know the syntax, and it is easier (for me) to remember than the prompts from easy-import. Now, the normal use of 'cvs import' is to make it easier to do the merge (the one you've already done). This would have been done like this: % cd <where-you-have-virigin-version-of-groff-mm> % cvs import src/contrib/groff/mm FSF v1_11a % cd /usr/src/contrib/groff/mm % cvs update -jv1_10 -jv1_11a ... resolve any conflicts ... % cvs commit Be aware that the 'cvs import' may change the HEAD version, so you don't want to do that on the real FreeBSD repository unless you either know that the merge will be _really_ easy, or all the files affected have 'left the vendor branch' - ie, they have been modified by non-import commits since they were initially imported. If this isn't the case, you might want to do your first import in a copy of the repository, just to get the convenient merge facilities. Be aware that the 'yesterday' example that is given by 'cvs import' is bogus - it assumes you haven't done another import since yesterday, which sometimes is false. > BTW, it's the mm macros. Please, DON'T do it for me, I want to learn > how to do it. I'm done far more than a reasonable amount of testing, > and I've had it checked, I just need to know the cvs mechanics. No problem. Eivind. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19980518183206.45376>