Date: Sun, 14 Apr 2002 02:14:59 -0700 From: "Crist J. Clark" <crist.clark@attbi.com> To: Juha Saarinen <juha@saarinen.org> Cc: "David W. Chapman Jr." <dwcjr@inethouston.net>, Matthias Andree <matthias.andree@gmx.de>, "freebsd-stable@freebsd.org" <freebsd-stable@FreeBSD.ORG> Subject: Re: "Unknown user: smmsp" Message-ID: <20020414021459.I43915@blossom.cjclark.org> In-Reply-To: <Pine.WNT.4.43.0204142054370.3044-100000@den2>; from juha@saarinen.org on Sun, Apr 14, 2002 at 09:00:14PM %2B1200 References: <20020414010439.H43915@blossom.cjclark.org> <Pine.WNT.4.43.0204142054370.3044-100000@den2>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020414021459.I43915>