From owner-freebsd-questions@FreeBSD.ORG Mon Apr 6 10:43:50 2009 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B1161065680 for ; Mon, 6 Apr 2009 10:43:50 +0000 (UTC) (envelope-from chowse@charter.net) Received: from mta21.charter.net (mta21.charter.net [216.33.127.81]) by mx1.freebsd.org (Postfix) with ESMTP id E53C68FC1E for ; Mon, 6 Apr 2009 10:43:49 +0000 (UTC) (envelope-from chowse@charter.net) Received: from imp09 ([10.20.200.9]) by mta21.charter.net (InterMail vM.7.09.01.00 201-2219-108-20080618) with ESMTP id <20090406104342.SMSZ3344.mta21.charter.net@imp09> for ; Mon, 6 Apr 2009 06:43:42 -0400 Received: from [192.168.254.3] ([24.176.107.223]) by imp09 with charter.net id cAjh1b00C4pDbjL05Ajhet; Mon, 06 Apr 2009 06:43:42 -0400 Message-Id: From: Charles Howse To: FreeBSD Questions Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v930.3) Date: Mon, 6 Apr 2009 05:43:41 -0500 X-Mailer: Apple Mail (2.930.3) Subject: mergemaster options 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: Mon, 06 Apr 2009 10:43:50 -0000 Hi, I'm upgrading form 4.6-RELEASE to 4.6-STABLE. When I get to the *second* run of mergemaster (after installworld), I'd be interested to hear the list's comments on using options to start mergemaster. For example, have you had good luck with: mergemaster -i -u (install any files that don't already exist, and attempt to install any files that haven't been user-modified) Also, what is the first line of a file used for? What parts of the OS 'care' about that line? What would happen if I kept the existing file below, with it's older date and version #? (This is just a made-up example). keep this existing file: # $FreeBSD: src/etc/csh.cshrc,v 1.3 1999/08/27 23:23:40 peter Exp $ my custom line blah delete this (fake) temporary file: # $FreeBSD: src/etc/csh.cshrc,v 1.4 2000/08/27 23:23:40 peter Exp $ blah blah I hope that's clear...? -- Later, Charles