From owner-freebsd-questions@FreeBSD.ORG Mon Apr 7 00:10:38 2003 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C16B437B401 for ; Mon, 7 Apr 2003 00:10:38 -0700 (PDT) Received: from gateway.webize.com.au (gateway.webize.com.au [203.17.1.92]) by mx1.FreeBSD.org (Postfix) with SMTP id 637F243F93 for ; Mon, 7 Apr 2003 00:10:36 -0700 (PDT) (envelope-from bsdmn@webize.com.au) Received: (qmail 9623 invoked from network); 7 Apr 2003 07:10:52 -0000 Received: from unknown (HELO webizepc) (192.168.100.10) by 192.168.100.50 with SMTP; 7 Apr 2003 07:10:52 -0000 From: "Carl Morley" To: "'Forrest Aldrich'" , Date: Mon, 7 Apr 2003 17:10:23 +1000 Message-ID: <000101c2fcd4$c1c0a790$0a64a8c0@webizepc> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook, Build 10.0.2627 Importance: Normal In-Reply-To: <5.2.1.1.2.20030407030418.0123d018@192.168.1.1> X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 Subject: RE: Mergemaster question X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2003 07:10:39 -0000 # -----Original Message----- # From: owner-freebsd-questions@freebsd.org [mailto:owner-freebsd- # questions@freebsd.org] On Behalf Of Forrest Aldrich # Sent: Monday, 7 April 2003 17:06 # To: freebsd-questions@freebsd.org # Subject: Mergemaster question # # There are certain config files that I don't really want mergemaster to # request changing, like /etc/hosts.allow, /etc/namedb/named.conf, and # others. Is there a way to configure this so that it won't touch certain # files, ever. If not, it seems like a reasonable feature to have ? # # _______________________________________________ # freebsd-questions@freebsd.org mailing list # http://lists.freebsd.org/mailman/listinfo/freebsd-questions # To unsubscribe, send any mail to "freebsd-questions- # unsubscribe@freebsd.org" When you run mergemaster, you get to choose which version of a particular file you want to keep, or you can merge them on a diff-by-diff basis. That would seem to be all the features you're after.