From owner-freebsd-stable Thu Apr 18 1:28:33 2002 Delivered-To: freebsd-stable@freebsd.org Received: from 12-234-22-238.client.attbi.com (12-234-90-219.client.attbi.com [12.234.90.219]) by hub.freebsd.org (Postfix) with ESMTP id 4ACB237B416 for ; Thu, 18 Apr 2002 01:28:29 -0700 (PDT) Received: from Master.gorean.org (master.gorean.org [10.0.0.2]) by 12-234-22-238.client.attbi.com (8.12.2/8.12.2) with ESMTP id g3I8STHt033972; Thu, 18 Apr 2002 01:28:29 -0700 (PDT) (envelope-from DougB@FreeBSD.org) Received: from Master.gorean.org (zoot [127.0.0.1]) by Master.gorean.org (8.12.2/8.12.2) with ESMTP id g3I8SULr008234; Thu, 18 Apr 2002 01:28:30 -0700 (PDT) (envelope-from DougB@FreeBSD.org) Received: from localhost (doug@localhost) by Master.gorean.org (8.12.2/8.12.2/Submit) with ESMTP id g3I8SUC0008231; Thu, 18 Apr 2002 01:28:30 -0700 (PDT) X-Authentication-Warning: Master.gorean.org: doug owned process doing -bs Date: Thu, 18 Apr 2002 01:28:30 -0700 (PDT) From: Doug Barton X-X-Sender: doug@master.gorean.org To: Michael Ross Cc: Kent Stewart , Subject: Re: Re: mergemaster has locked me out In-Reply-To: <200204150304.g3F348t25683@mail024.syd.optusnet.com.au> Message-ID: <20020418012619.H7848-100000@master.gorean.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII 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 On Mon, 15 Apr 2002, Michael Ross wrote: > Is there an easy way to just get mergemaster to update the new users > in your /etc/passwd files while leaving your existing ones alone? There are various ideas floating around to use cvs to accomplish this, but none of them are particularly easy to implement, or satisfy everyone. ... Not that I won't keep trying, but meanwhile, in addition to the "pay attention" advice you've already received, I'd add "read the mergemaster man page, especially where it says your first step should be TAKE GOOD BACKUPS BEFORE YOU START." :) -- "We have known freedom's price. We have shown freedom's power. And in this great conflict, ... we will see freedom's victory." - George W. Bush, President of the United States State of the Union, January 28, 2002 Do YOU Yahoo!? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message