From owner-freebsd-questions@FreeBSD.ORG Thu Mar 22 22:25:09 2007 Return-Path: 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 2274816A408 for ; Thu, 22 Mar 2007 22:25:09 +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 D2DC813C44B for ; Thu, 22 Mar 2007 22:25:06 +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 <0JFB00776Q5TN180@osl1smout1.broadpark.no>; Thu, 22 Mar 2007 22:25:05 +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 <0JFB00MFFQ5T76H0@osl1sminn1.broadpark.no>; Thu, 22 Mar 2007 22:25:05 +0100 (CET) Date: Thu, 22 Mar 2007 22:25:03 +0100 From: Kyrre =?iso-8859-1?Q?Nyg=E5rd?= In-reply-to: <200703170029.25066.pieter@degoeje.nl> To: Pieter de Goeje , freebsd-questions@freebsd.org Message-id: <0JFB00MFGQ5T76H0@osl1sminn1.broadpark.no> MIME-version: 1.0 X-Mailer: QUALCOMM Windows Eudora Version 7.1.0.9 Content-type: text/plain; charset=iso-8859-1; format=flowed Content-transfer-encoding: quoted-printable References: <7.0.1.0.2.20070316102312.04601550@broadpark.no> <200703170029.25066.pieter@degoeje.nl> Cc: questions@freebsd.org Subject: Re: Automating MERGEMASTER(8) X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Mar 2007 22:25:09 -0000 At 00:29 17.03.2007, Pieter de Goeje wrote: >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 aaaaaaaaaah thanks a lot man :D=20