From owner-freebsd-questions Wed Oct 9 11: 3: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 19E1037B401 for ; Wed, 9 Oct 2002 11:03:51 -0700 (PDT) Received: from wonkity.com (wonkity.com [63.93.4.4]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7005443E3B for ; Wed, 9 Oct 2002 11:03:50 -0700 (PDT) (envelope-from wblock@wonkity.com) Received: from wonkity.com (localhost.wonkity.com [127.0.0.1]) by wonkity.com (8.12.1/8.11.6) with ESMTP id g99I3nuF039702; Wed, 9 Oct 2002 12:03:49 -0600 (MDT) (envelope-from wblock@wonkity.com) Received: from localhost (wblock@localhost) by wonkity.com (8.12.1/8.12.1/Submit) with ESMTP id g99I3nRi039699; Wed, 9 Oct 2002 12:03:49 -0600 (MDT)?g (envelope-from wblock@wonkity.com) Date: Wed, 9 Oct 2002 12:03:49 -0600 (MDT) From: Warren Block To: Matt Garcia Cc: freebsd-questions@FreeBSD.ORG Subject: Re: Regarding Upgrade In-Reply-To: <20021009042400.98043.qmail@web21207.mail.yahoo.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII 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 On Wed, 9 Oct 2002, 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. Check the revision dates at the top of the file. -Warren Block * Rapid City, South Dakota USA To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message