Date: Wed, 9 Oct 2002 11:45:44 +0200 From: Roman Neuhauser <neuhauser@bellavista.cz> To: Scott Robbins <scottro@nyc.rr.com> Cc: freebsd-questions@FreeBSD.ORG Subject: Re: Regarding Upgrade Message-ID: <20021009094544.GB51897@freepuppy.bellavista.cz> In-Reply-To: <20021009054622.GA4421%scottro@despammed.com> References: <20021009042400.98043.qmail@web21207.mail.yahoo.com> <20021009054622.GA4421%scottro@despammed.com>
next in thread | previous in thread | raw e-mail | index | archive | help
# 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021009094544.GB51897>