From owner-freebsd-questions@FreeBSD.ORG  Sun Nov 18 14:49:35 2007
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 94E5E16A41A
	for <freebsd-questions@freebsd.org>;
	Sun, 18 Nov 2007 14:49:35 +0000 (UTC) (envelope-from hg@queue.to)
Received: from pickle.queue.to (pickle.queue.to [71.180.69.18])
	by mx1.freebsd.org (Postfix) with ESMTP id 3701613C45A
	for <freebsd-questions@freebsd.org>;
	Sun, 18 Nov 2007 14:49:35 +0000 (UTC) (envelope-from hg@queue.to)
Received: (qmail 76743 invoked from network); 18 Nov 2007 09:49:28 -0500
Received: from cally.queue.to (172.16.0.6)
	by pickle.queue.to with ESMTP; 18 Nov 2007 09:49:28 -0500
Message-ID: <474050F8.9030208@queue.to>
Date: Sun, 18 Nov 2007 09:49:28 -0500
From: Howard Goldstein <hg@queue.to>
User-Agent: Thunderbird 2.0.0.9 (X11/20071116)
MIME-Version: 1.0
To: Giorgos Keramidas <keramida@freebsd.org>
References: <20071117043426.GA71265@auricle.charter.net>	<20071117181156.GC2834@kobe.laptop>
	<473F9002.6040703@queue.to> <20071118083524.GB83139@kobe.laptop>
In-Reply-To: <20071118083524.GB83139@kobe.laptop>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: freebsd-questions@freebsd.org
Subject: Re: Making mergemaster skip certain files
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Nov 2007 14:49:35 -0000

Giorgos Keramidas wrote:
> On 2007-11-17 20:06, Howard Goldstein <hg@queue.to> wrote:
>> Giorgos Keramidas wrote:
>>> On 2007-11-16 22:34, "J. Porter Clark" <jpc@porterclark.com> wrote:
>>> mergemaster for more details, but here's a short description of what I
>>> use on my laptop for some time now:
>>> 1. A `.mergemasterrc' file in the HOME directory of the `root' user,
>>>    which contains:
>>>    [snip]
>>>
>>> 2. The `/root/mm-pre-compare.sh' script contains the following:
>>>    [snip]
>> Please consider submitting this as a PR in hopes it gets included in
>> the actual package.
> 
> Since mergemaster is included in the base system, I can directly commit
> to its manpage.  There is already a description of `.mergemasterrc' in
> the manpage, so I'm guessing you want a sample script added?
> 

Yes, please.  Could the accompanying .mergemasterrc bits be included in
the sample script commented out to keep all the pieces in one place for
folks who'll use the example?  (Or I suppose an example .mergemasterrc
might be include-able (is that a word?))