From owner-freebsd-stable Sun Apr 14 2:15: 5 2002 Delivered-To: freebsd-stable@freebsd.org Received: from rwcrmhc51.attbi.com (rwcrmhc51.attbi.com [204.127.198.38]) by hub.freebsd.org (Postfix) with ESMTP id DCDA837B404 for ; Sun, 14 Apr 2002 02:15:00 -0700 (PDT) Received: from blossom.cjclark.org ([12.234.91.48]) by rwcrmhc51.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020414091500.KDRX1143.rwcrmhc51.attbi.com@blossom.cjclark.org>; Sun, 14 Apr 2002 09:15:00 +0000 Received: (from cjc@localhost) by blossom.cjclark.org (8.11.6/8.11.6) id g3E9F0k52181; Sun, 14 Apr 2002 02:15:00 -0700 (PDT) (envelope-from cjc) Date: Sun, 14 Apr 2002 02:14:59 -0700 From: "Crist J. Clark" To: Juha Saarinen Cc: "David W. Chapman Jr." , Matthias Andree , "freebsd-stable@freebsd.org" Subject: Re: "Unknown user: smmsp" Message-ID: <20020414021459.I43915@blossom.cjclark.org> Reply-To: cjclark@alum.mit.edu References: <20020414010439.H43915@blossom.cjclark.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: ; from juha@saarinen.org on Sun, Apr 14, 2002 at 09:00:14PM +1200 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 Sun, Apr 14, 2002 at 09:00:14PM +1200, Juha Saarinen wrote: > On Sun, 14 Apr 2002, Crist J. Clark wrote: > > > # mergemaster -p > > > > > > Was added just for this. > > Thanks -- could this be documented in UPDATING? > > Which version of mergemaster supports -p? The one I have (4.3-STABLE) > doesn't: For 5-CURRENT, revision 1.27 date: 2002/02/24 10:22:14; author: dougb; state: Exp; lines: +90 -26 * Add a feature to do a "pre {build|install}world" check of (so far) master.passwd, group, and make.conf * Add a feature to check variables in rc.conf[.local] to their counterparts in /etc/defaults/rc.conf after a run * Twiddle whitespace a little * Change some "[ -f file ] && rm file" to "rm -f file" For 4-STABLE, revision 1.6.2.11 date: 2002/04/08 10:35:15; author: dougb; state: Exp; lines: +92 -25 MFC 1.27 - 1.29. * Pre buildworld and post-mm file comparison modes * Some small code improvements * Delete files in ${TEMPROOT}/usr/obj to avoid comparing them -- 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