From owner-freebsd-questions@FreeBSD.ORG  Fri Mar 16 10:32:10 2007
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
X-Original-To: questions@freebsd.org
Delivered-To: freebsd-questions@FreeBSD.ORG
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 22B7516A402
	for <questions@freebsd.org>; Fri, 16 Mar 2007 10:32:10 +0000 (UTC)
	(envelope-from kyrreny@broadpark.no)
Received: from osl1smout1.broadpark.no (osl1smout1.broadpark.no [80.202.4.58])
	by mx1.freebsd.org (Postfix) with ESMTP id D92A213C43E
	for <questions@freebsd.org>; Fri, 16 Mar 2007 10:32:09 +0000 (UTC)
	(envelope-from kyrreny@broadpark.no)
Received: from osl1sminn1.broadpark.no ([80.202.4.59])
	by osl1smout1.broadpark.no
	(Sun Java System Messaging Server 6.1 HotFix 0.05 (built Oct 21 2004))
	with ESMTP id <0JEZ00CM9P5IBB00@osl1smout1.broadpark.no> for
	questions@freebsd.org; Fri, 16 Mar 2007 10:32:06 +0100 (CET)
Received: from suria.broadpark.no ([80.203.212.30]) by osl1sminn1.broadpark.no
	(Sun Java System Messaging Server 6.1 HotFix 0.05 (built Oct 21
	2004)) with ESMTP id <0JEZ006A1P581OE2@osl1sminn1.broadpark.no> for
	questions@freebsd.org; Fri, 16 Mar 2007 10:32:06 +0100 (CET)
Date: Fri, 16 Mar 2007 10:32:04 +0100
From: Kyrre =?iso-8859-1?Q?Nyg=E5rd?= <kyrreny@broadpark.no>
To: questions@freebsd.org
Message-id: <7.0.1.0.2.20070316102312.04601550@broadpark.no>
MIME-version: 1.0
X-Mailer: QUALCOMM Windows Eudora Version 7.0.1.0
Content-type: text/plain; charset=us-ascii; format=flowed
Content-transfer-encoding: 7BIT
Cc: 
Subject: Automating MERGEMASTER(8)
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: Fri, 16 Mar 2007 10:32:10 -0000


Hello,

Is it possible to make MERGEMASTER(8) automatically replace files 
with a FreeBSD CVS Id, and skip (or prompt interactively) the ones 
without a FreeBSD CVS Id? The ones without are most certainly my own 
personalized configuration files. I'd really like to keep them 
intact. And on every MERGEMASTER(8) session I tend to replace every 
single file but them.

Thanks everyone!

All the best,
Kyrre