From owner-freebsd-stable@FreeBSD.ORG Mon May 11 04:47:07 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DED171065672 for ; Mon, 11 May 2009 04:47:07 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx24.fluidhosting.com [204.14.89.7]) by mx1.freebsd.org (Postfix) with ESMTP id 79B998FC14 for ; Mon, 11 May 2009 04:47:07 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 3582 invoked by uid 399); 11 May 2009 04:47:03 -0000 Received: from localhost (HELO ?192.168.0.103?) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 11 May 2009 04:47:03 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4A07ADC4.6060209@FreeBSD.org> Date: Sun, 10 May 2009 21:47:00 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.21 (Windows/20090302) MIME-Version: 1.0 To: Doug Hardie References: <1BA7DBA9-3C49-490A-B97C-DEB08DF2F696@lafn.org> In-Reply-To: <1BA7DBA9-3C49-490A-B97C-DEB08DF2F696@lafn.org> X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-stable Stable Subject: Re: Mergemaster X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2009 04:47:08 -0000 Doug Hardie wrote: > I have been following the discussion on mergemaster and one item is a > bit annoying. You can use -U in the command args which sets > "AUTO_UPGRADE=yes". So far so good. > That flag is not in mergemaster.rc. I'm not sure what that is supposed to mean. There is no rc file by default, you have to create it. If what you mean is that it wasn't mentioned in the man page, that has been fixed for a while now. > It could be > easily added to the rc file, but I suspect it would conflict with -p. It would not conflict with it, in fact if everything is working as it should it should be totally safe. > Hence it seems like if "unset AUTO_UPGRADE" were added to the -p section > then it would work. I try hard not to outthink what the user is trying to do, which of course works both ways. > It would be helpful to be able to include it in the > rc file so I don't have to remember the options each time. [ -z "$PRE_WORLD" ] && AUTO_UPGRADE=yes hth, Doug