From owner-freebsd-stable Tue May 21 11:42:40 2002 Delivered-To: freebsd-stable@freebsd.org Received: from alicia.nttmcl.com (alicia.nttmcl.com [216.69.69.10]) by hub.freebsd.org (Postfix) with ESMTP id 4CC1737B401 for ; Tue, 21 May 2002 11:42:37 -0700 (PDT) Received: (from jj@localhost) by alicia.nttmcl.com (8.10.1/8.10.1) id g4LIgbZ19296; Tue, 21 May 2002 11:42:37 -0700 (PDT) Date: Tue, 21 May 2002 11:42:37 -0700 From: JJ Behrens To: FreeBSD Stable , Chip Wiegand Subject: Re: makeworld worked - my first attempt at this revisited Message-ID: <20020521114237.B16956@alicia.nttmcl.com> Mail-Followup-To: JJ Behrens , FreeBSD Stable , Chip Wiegand References: <1021840002.14040.47.camel@chip3.wiegand.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2i In-Reply-To: <1021840002.14040.47.camel@chip3.wiegand.org>; from chip@wiegand.org on Sun, May 19, 2002 at 01:26:30PM -0700 Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG > After this I had to add my user account back into /etc/passwd, I thought > I'd taken care of that during the mergemaster, but it didn't show up in > /etc/passwd.I'm still a bit confused by the mergemaster screens. > Everthing I've read refers to there being a split view, left and right, > but that's not what I got. I had the old lines and the new lines all in > one view, with +'s and -'s. So I probably messed up on that, but it was > a simple fix after all was said and done. It may be helpful to read the manpage for mergemaster and sdiff. This can be a bit confusing the first time through. :) Congratulations! -jj -- Users of C++ should consider hanging themselves rather than shooting their legs off--it's best not to use C++ simply as a better C. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message