From owner-freebsd-questions Thu Mar 4 21: 0: 7 1999 Delivered-To: freebsd-questions@freebsd.org Received: from inet.chip-web.com (c1003518-a.plstn1.sfba.home.com [24.1.82.47]) by hub.freebsd.org (Postfix) with SMTP id 30AD41515F for ; Thu, 4 Mar 1999 21:00:02 -0800 (PST) (envelope-from ludwigp@bigfoot.com) Received: (qmail 5625 invoked from network); 5 Mar 1999 04:59:44 -0000 Received: from speedy.chip-web.com (HELO speedy) (172.16.1.1) by inet.chip-web.com with SMTP; 5 Mar 1999 04:59:44 -0000 Message-Id: <4.1.19990304204739.00a828f0@mail-r> X-Sender: ludwigp@mail-r X-Mailer: QUALCOMM Windows Eudora Pro Version 4.1 Date: Thu, 04 Mar 1999 20:59:36 -0800 To: Spidey From: Ludwig Pummer Subject: Re: 3.0-stable cvsup tag Cc: freebsd-questions In-Reply-To: References: <4.1.19990304201339.00923330@mail-r> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG At 08:38 PM 3/4/99 , Spidey wrote: >mergemaster??? /usr/ports/sysutils/mergemaster An excellent program written by Douglas Barton . It takes all the pain out of merging your /etc and the new /etc that your latest CVSups have. After making world before rebooting, run mergemaster from /usr/src. It creates /var/tmp/temproot, populates it with new files, and compares them one-by-one with what you already have. For each different files, it lets you a) delete the new files from /var/tmp/temproot b) replace your /etc file with the new one c) use sdiff to merge them right-then-and-there or d) leave the file in /var/tmp/temproot for later. After you run mergemaster, anything left in /var/tmp/temproot is for you to take care of yourself. >And for the rm -R, I think that a simple make clean should have done it... It didn't seem to have the 'clean' target when I tried it (I tried it just now and make clean works). I must have made a mistake back then. In any case, rm -R doesn't take long, so I don't care. >Vinum? He he he... one mention of Vinum and Greg Lehey always gets involved (he wrote it). It's kind of ccd-but-better (but still officially an alpha release). I'm using it to mirror 2 IDE drives so that if one drive dies I don't lose my data. This is what I'm doing instead of backups (yes, i know real tape backups are better, but my high school student budget can't cover a DAT drive). --Ludwig Pummer ( ludwigp@bigfoot.com ) ICQ UIN: 692441 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message