From owner-freebsd-questions Tue Oct 8 21:45: 9 2002 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 DD8DB37B401 for ; Tue, 8 Oct 2002 21:45:07 -0700 (PDT) Received: from nycsmtp2out.rdc-nyc.rr.com (nycsmtp2out.rdc-nyc.rr.com [24.29.99.227]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B2CA43E9C for ; Tue, 8 Oct 2002 21:45:07 -0700 (PDT) (envelope-from scottro@nyc.rr.com) Received: from nyc.rr.com (66-108-172-188.nyc.rr.com [66.108.172.188]) by nycsmtp2out.rdc-nyc.rr.com (8.12.1/Road Runner SMTP Server 1.0) with SMTP id g994g3lY026291 for ; Wed, 9 Oct 2002 00:42:04 -0400 (EDT) Date: Wed, 9 Oct 2002 00:46:22 -0500 From: Scott Robbins To: freebsd-questions@FreeBSD.ORG Subject: Re: Regarding Upgrade Message-ID: <20021009054622.GA4421%scottro@despammed.com> Mail-Followup-To: freebsd-questions@FreeBSD.ORG References: <20021009042400.98043.qmail@web21207.mail.yahoo.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="M9NhX3UHpAaciwkO" Content-Disposition: inline In-Reply-To: <20021009042400.98043.qmail@web21207.mail.yahoo.com> User-Agent: Mutt/1.4i-ja.1 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 --M9NhX3UHpAaciwkO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Oct 09, 2002 at 12:24:00AM -0400, Matt Garcia wrote: > Hi, >=20 > I finished doing an upgrade for freebsd from > 4.5-stable to 4.7RC. I had a question regarding the > mergemaster. After everything is done when running > the mergemaster everything on the LEFT side is new and > everything on the right side is old or is it vice > versa ? i forgot which is which. Heh, I used to have to go to the man page, or a book I had every time. I finally figured out a mneumonic, but it's so complex, I'm not going to mention it here, it has to do with the right brain being the dreamer and looking ahead. :) (Well, I sort of mentioned it, but...) Left is old, right is new--easier to determine when you're looking at things like /etc/passwd---because only the left side will have the users you've added. =20 >=20 --=20 Scott PGP keyID EB3467D6 ( 1B48 077D 66F6 9DB0 FDC2 A409 FA54 D575 EB34 67D6 ) gpg --keyserver pgp.mit.edu --recv-keys EB3467D6 Xander: Cavalry's here! Cavalry's a scared guy with a club, but it's here!=20 --M9NhX3UHpAaciwkO Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.7 (GNU/Linux) iD8DBQE9o8Ku+lTVdes0Z9YRAv09AJ4oNQfTkSYzkid8izYZ8xWiDdC8/QCdGupm V5sl6OUTIaoc5ggvLt2BGBU= =7+PD -----END PGP SIGNATURE----- --M9NhX3UHpAaciwkO-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message