From owner-freebsd-stable@FreeBSD.ORG  Wed Nov 24 21:56:26 2004
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 107E916A4CE
	for <freebsd-stable@freebsd.org>;
	Wed, 24 Nov 2004 21:56:26 +0000 (GMT)
Received: from manor.msen.com (manor.msen.com [148.59.4.66])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A489143D46
	for <freebsd-stable@freebsd.org>;
	Wed, 24 Nov 2004 21:56:25 +0000 (GMT)
	(envelope-from wayne@manor.msen.com)
Received: from manor.msen.com (localhost [127.0.0.1])
	by manor.msen.com (8.12.9p2/8.12.9) with ESMTP id iAOLuOO7044985
	for <freebsd-stable@freebsd.org>;
	Wed, 24 Nov 2004 16:56:25 -0500 (EST)
	(envelope-from wayne@manor.msen.com)
Received: (from wayne@localhost)
	by manor.msen.com (8.12.9p2/8.12.9/Submit) id iAOLuOpP044984
	for freebsd-stable@freebsd.org; Wed, 24 Nov 2004 16:56:24 -0500 (EST)
	(envelope-from wayne)
Date: Wed, 24 Nov 2004 16:56:24 -0500
From: "Michael R. Wayne" <freebsd@wayne47.com>
To: freebsd-stable@freebsd.org
Message-ID: <20041124215624.GE49800@manor.msen.com>
Mail-Followup-To: freebsd-stable@freebsd.org
References: <41A4E150.4050304@ISI.EDU>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <41A4E150.4050304@ISI.EDU>
User-Agent: Mutt/1.4.2.1i
Subject: Re: mergemaster
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Nov 2004 21:56:26 -0000

On Wed, Nov 24, 2004 at 11:30:24AM -0800, Tejas Kokje wrote:
> 
> I am upgrading by freebsd installation. While doing mergemaster, it 
> didn't ask me whether it should overwrite my /etc/motd file.
> 
> Is manual backing up of /etc/motd the only option or have I missed 
> something in mergemaster ?

You should consider using my patched mergemaster which supports RCS
on every file that it patches (check the archives).  And before
anyone suggests sending a PR, I have exchanged email with the
maintainer of mergemaster and he is not interested in incorporating
the changes.

/\/\ \/\/