From owner-freebsd-questions Wed Feb 26 9:30:31 2003 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 C759937B401 for ; Wed, 26 Feb 2003 09:30:30 -0800 (PST) Received: from mired.org (ip68-97-54-220.ok.ok.cox.net [68.97.54.220]) by mx1.FreeBSD.org (Postfix) with SMTP id 8B27B43FA3 for ; Wed, 26 Feb 2003 09:30:29 -0800 (PST) (envelope-from mwm-dated-1046712626.3125cc@mired.org) Received: (qmail 32602 invoked from network); 26 Feb 2003 17:30:26 -0000 Received: from localhost.mired.org (HELO guru.mired.org) (127.0.0.1) by localhost.mired.org with SMTP; 26 Feb 2003 17:30:26 -0000 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <15964.63921.392773.786794@guru.mired.org> Date: Wed, 26 Feb 2003 11:30:25 -0600 To: Bill Moran Cc: Jim Trigg , questions@freebsd.org Subject: Re: 4.7 Upgrade issue - Daniel Bye In-Reply-To: <3E5CF8CE.6030209@potentialtech.com> References: <20030226152725.0B4EB43F3F@mx1.FreeBSD.org> <20030226154635.GG55640@catflap.home.slightlystrange.org> <20030226170922.GG46587@scadian.net> <3E5CF8CE.6030209@potentialtech.com> X-Mailer: VM 7.07 under 21.1 (patch 14) "Cuyahoga Valley" XEmacs Lucid X-face: "5Mnwy%?j>IIV\)A=):rjWL~NB2aH[}Yq8Z=u~vJ`"(,&SiLvbbz2W`; h9L,Yg`+vb1>RG% *h+%X^n0EZd>TM8_IB;a8F?(Fb"lw'IgCoyM.[Lg#r\ From: Mike Meyer X-Delivery-Agent: TMDA/0.70 (Pensive) Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In <3E5CF8CE.6030209@potentialtech.com>, Bill Moran typed: > And _always_ back up /etc before running mergemaster. It only has to > save you from a stupid mistake 1 time to be worth it! (I know) This has worked so well for me, I'm going to suggest it to everyone here. Don't back up /etc. Store the files you modify in a source code control system. Use rcs, as that's part of the base system. Use cvs if you prefer it. Personally, I use perforce. That means you have backups of all the files you've changed. It also means you can get change histories for the files. It beats the dickens out of umpteen files called foo-back, foo-old, and etc. It works better than dated backups as well. http://www.mired.org/consulting.html Independent WWW/Perforce/FreeBSD/Unix consultant, email for more information. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message