From owner-freebsd-questions@FreeBSD.ORG  Fri Mar 16 23:29:30 2007
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
X-Original-To: freebsd-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 D003E16A404
	for <freebsd-questions@freebsd.org>;
	Fri, 16 Mar 2007 23:29:30 +0000 (UTC)
	(envelope-from pieter@degoeje.nl)
Received: from smtp.utwente.nl (smtp2.utsp.utwente.nl [130.89.2.9])
	by mx1.freebsd.org (Postfix) with ESMTP id 559BB13C455
	for <freebsd-questions@freebsd.org>;
	Fri, 16 Mar 2007 23:29:30 +0000 (UTC)
	(envelope-from pieter@degoeje.nl)
Received: from nox.student.utwente.nl (nox.student.utwente.nl [130.89.165.91])
	by smtp.utwente.nl (8.12.10/SuSE Linux 0.7) with ESMTP id
	l2GNTPox019492; Sat, 17 Mar 2007 00:29:26 +0100
From: Pieter de Goeje <pieter@degoeje.nl>
To: freebsd-questions@freebsd.org
Date: Sat, 17 Mar 2007 00:29:24 +0100
User-Agent: KMail/1.9.5
References: <7.0.1.0.2.20070316102312.04601550@broadpark.no>
In-Reply-To: <7.0.1.0.2.20070316102312.04601550@broadpark.no>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Message-Id: <200703170029.25066.pieter@degoeje.nl>
X-UTwente-MailScanner-Information: Scanned by MailScanner. Contact
	helpdesk@ITBE.utwente.nl for more information.
X-UTwente-MailScanner: Found to be clean
X-UTwente-MailScanner-From: pieter@degoeje.nl
X-Spam-Status: No
Cc: questions@freebsd.org,
	Kyrre =?iso-8859-1?q?Nyg=E5rd?= <kyrreny@broadpark.no>
Subject: Re: 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 23:29:30 -0000

On Friday 16 March 2007 10:32, Kyrre Nyg=E5rd wrote:
> 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
mergemaster -U

Cheers,

Pieter