Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Apr 2002 22:59:47 -0700
From:      "Crist J. Clark" <cjc@FreeBSD.ORG>
To:        Michael Ross <satare@optusnet.com.au>
Cc:        Kent Stewart <kstewart@owt.com>, freebsd-stable@FreeBSD.ORG
Subject:   Re: Re: mergemaster has locked me out
Message-ID:  <20020414225947.F53133@blossom.cjclark.org>
In-Reply-To: <200204150304.g3F348t25683@mail024.syd.optusnet.com.au>; from satare@optusnet.com.au on Mon, Apr 15, 2002 at 01:04:08PM %2B1000
References:  <200204150304.g3F348t25683@mail024.syd.optusnet.com.au>

next in thread | previous in thread | raw e-mail | index | archive | help
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020414225947.F53133>