From owner-freebsd-questions Wed Oct 9 2:45:51 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 BB0C137B401 for ; Wed, 9 Oct 2002 02:45:50 -0700 (PDT) Received: from mail.thundernet.cz (mail.thundernet.cz [62.77.87.114]) by mx1.FreeBSD.org (Postfix) with SMTP id 3D3BF43E4A for ; Wed, 9 Oct 2002 02:45:49 -0700 (PDT) (envelope-from neuhauser@bellavista.cz) Received: (qmail 7571 invoked from network); 9 Oct 2002 09:45:47 -0000 Received: from unknown (HELO freepuppy.bellavista.cz) (62.168.44.50) by mail.thundernet.cz with SMTP; 9 Oct 2002 09:45:47 -0000 Received: by freepuppy.bellavista.cz (Postfix, from userid 1001) id 0A5842FDAB2; Wed, 9 Oct 2002 11:45:44 +0200 (CEST) Date: Wed, 9 Oct 2002 11:45:44 +0200 From: Roman Neuhauser To: Scott Robbins Cc: freebsd-questions@FreeBSD.ORG Subject: Re: Regarding Upgrade Message-ID: <20021009094544.GB51897@freepuppy.bellavista.cz> Mail-Followup-To: Scott Robbins , freebsd-questions@FreeBSD.ORG References: <20021009042400.98043.qmail@web21207.mail.yahoo.com> <20021009054622.GA4421%scottro@despammed.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20021009054622.GA4421%scottro@despammed.com> User-Agent: Mutt/1.5.1i 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 # scottro@nyc.rr.com / 2002-10-09 00:46:22 -0500: > On Wed, Oct 09, 2002 at 12:24:00AM -0400, Matt Garcia wrote: > > 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. Strange. I never had this problem. It's obvious for files that have local mods, because, well, you modified them (/etc/passwd...), and irrelevant in case of files w/o any local mods, because then you can just "install the new version". Without the need to know which side of the screen the new file is at. -- begin 666 nonexistent.vbs FreeBSD 4.7-RC 11:41AM up 21 days, 18:55, 14 users, load averages: 0.13, 0.15, 0.10 end To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message