From owner-freebsd-stable Sun Apr 14 2: 0:52 2002 Delivered-To: freebsd-stable@freebsd.org Received: from vimfuego.saarinen.org (saarinen.org [203.79.82.14]) by hub.freebsd.org (Postfix) with ESMTP id 29DE637B405; Sun, 14 Apr 2002 02:00:46 -0700 (PDT) Received: from [192.168.1.12] (helo=den2) by vimfuego.saarinen.org with esmtp (Exim 3.35 #1 (Red Hack)) id 16wfsJ-00055I-00; Sun, 14 Apr 2002 21:00:43 +1200 Date: Sun, 14 Apr 2002 21:00:14 +1200 (New Zealand Standard Time) From: Juha Saarinen To: "Crist J. Clark" Cc: "David W. Chapman Jr." , Matthias Andree , "freebsd-stable@freebsd.org" Subject: Re: "Unknown user: smmsp" In-Reply-To: <20020414010439.H43915@blossom.cjclark.org> Message-ID: X-Message-Flag: " " X-X-Sender: juha@vimfuego.saarinen.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 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: $ mergemaster -p mergemaster version 1.6.2.10 Usage: mergemaster [-scrvahi] [-m /path] [-t /path] [-d] [-u N] [-w N] [-D /path] Options: -s Strict comparison (diff every pair of files) -c Use context diff instead of unified diff -r Re-run on a previously cleaned directory (skip temproot creation) -v Be more verbose about the process, include additional checks -a Leave all files that differ to merge by hand -h Display more complete help -i Automatically install files that do not exist in destination directory -m /path/directory Specify location of source to do the make in -t /path/directory Specify temp root directory -d Add date and time to directory name (e.g., /var/tmp/temproot.0414.21.16) -u N Specify a numeric umask -w N Specify a screen width in columns to sdiff -D /path/directory Specify the destination directory to install files to -- Juha Saarinen To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message