From owner-freebsd-questions Thu Dec 23 5: 8:57 1999 Delivered-To: freebsd-questions@freebsd.org Received: from merlin.onsea.com (p53s05a01.client.global.net.uk [195.147.133.84]) by hub.freebsd.org (Postfix) with ESMTP id D70B914E65 for ; Thu, 23 Dec 1999 05:08:45 -0800 (PST) (envelope-from dozprompt@onsea.com) Received: from localhost (dozprompt@localhost) by merlin.onsea.com (8.9.3/8.9.2) with ESMTP id UAA01534; Wed, 22 Dec 1999 20:48:52 GMT (envelope-from dozprompt@onsea.com) X-Authentication-Warning: merlin.onsea.com: dozprompt owned process doing -bs Date: Wed, 22 Dec 1999 20:48:52 +0000 (GMT) From: Cliff Rowley To: Sheldon Hearn Cc: Jonathon McKitrick , freebsd-questions@FreeBSD.ORG Subject: Re: mergemaster after upgrade In-Reply-To: <35390.945883260@axl.noc.iafrica.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG So what do you do if you havent used mergemaster since you installed from your 3.2 CD? A er "friend" of er mine is in this situation *not blushing really* Wouldnt it be hell upgrading to -current from -stable? there will be so many changes that mergemaster would be hell, and take a long time... - while (!asleep) { code(); } On Wed, 22 Dec 1999, Sheldon Hearn wrote: > > > On Wed, 22 Dec 1999 17:17:57 GMT, Jonathon McKitrick wrote: > > > So the best bet is to just carefully go through mergemaster, and figure > > out what everything means? Then decide whether it needs merging or not? > > Yes. > > Ciao, > Sheldon. > > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-questions" in the body of the message > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message