From owner-freebsd-stable Sun Apr 14 22:59:50 2002 Delivered-To: freebsd-stable@freebsd.org Received: from rwcrmhc53.attbi.com (rwcrmhc53.attbi.com [204.127.198.39]) by hub.freebsd.org (Postfix) with ESMTP id 45DE837B400 for ; Sun, 14 Apr 2002 22:59:48 -0700 (PDT) Received: from blossom.cjclark.org ([12.234.91.48]) by rwcrmhc53.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020415055947.KKLR1083.rwcrmhc53.attbi.com@blossom.cjclark.org>; Mon, 15 Apr 2002 05:59:47 +0000 Received: (from cjc@localhost) by blossom.cjclark.org (8.11.6/8.11.6) id g3F5xl754543; Sun, 14 Apr 2002 22:59:47 -0700 (PDT) (envelope-from cjc) Date: Sun, 14 Apr 2002 22:59:47 -0700 From: "Crist J. Clark" To: Michael Ross Cc: Kent Stewart , freebsd-stable@FreeBSD.ORG Subject: Re: Re: mergemaster has locked me out Message-ID: <20020414225947.F53133@blossom.cjclark.org> References: <200204150304.g3F348t25683@mail024.syd.optusnet.com.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200204150304.g3F348t25683@mail024.syd.optusnet.com.au>; from satare@optusnet.com.au on Mon, Apr 15, 2002 at 01:04:08PM +1000 X-URL: http://people.freebsd.org/~cjc/ 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, Apr 15, 2002 at 01:04:08PM +1000, Michael Ross wrote: [snip] > 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? Just 'm' (merge) the files. Make sure to include the new $FreeBSD$ tag so that the next mergemaster(8) won't decides it needs updating unless it really does. -- Crist J. Clark | cjclark@alum.mit.edu | cjclark@jhu.edu http://people.freebsd.org/~cjc/ | cjc@freebsd.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message