From owner-freebsd-questions@FreeBSD.ORG Wed Jan 7 06:35:57 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 7AB061065670 for ; Wed, 7 Jan 2009 06:35:57 +0000 (UTC) (envelope-from peter@boosten.org) Received: from smtpq2.gn.mail.iss.as9143.net (smtpq2.gn.mail.iss.as9143.net [212.54.34.165]) by mx1.freebsd.org (Postfix) with ESMTP id 341008FC0C for ; Wed, 7 Jan 2009 06:35:57 +0000 (UTC) (envelope-from peter@boosten.org) Received: from [212.54.34.133] (helo=smtp2.gn.mail.iss.as9143.net) by smtpq2.gn.mail.iss.as9143.net with esmtp (Exim 4.69) (envelope-from ) id 1LKS1E-0007Rt-2F; Wed, 07 Jan 2009 07:35:56 +0100 Received: from [84.25.72.219] (helo=ra.egypt.nl) by smtp2.gn.mail.iss.as9143.net with esmtp (Exim 4.69) (envelope-from ) id 1LKS14-0001Go-Tm; Wed, 07 Jan 2009 07:35:46 +0100 Received: from [127.0.0.1] (xp.egypt.nl [192.168.13.35]) by ra.egypt.nl (Postfix) with ESMTP id CF34539887; Wed, 7 Jan 2009 07:35:32 +0100 (CET) Message-ID: <49644D35.5020103@boosten.org> Date: Wed, 07 Jan 2009 07:35:33 +0100 From: Peter Boosten User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: Yuri Pankov References: <4964467D.9020606@boosten.org> <20090107061339.GB12584@darklight.homeunix.org> In-Reply-To: <20090107061339.GB12584@darklight.homeunix.org> X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-ZiggoSMTP-MailScanner-Information: Please contact the ISP for more information X-ZiggoSMTP-MailScanner-ID: 1LKS14-0001Go-Tm X-ZiggoSMTP-MailScanner: Found to be clean X-ZiggoSMTP-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-1.913, required 5, BAYES_00 -2.60, SPF_NEUTRAL 0.69) X-ZiggoSMTP-MailScanner-From: peter@boosten.org X-Spam-Status: No Cc: freebsd-questions@freebsd.org, Johann Hasselbach Subject: Re: mergemaster goof when src upgrading 7.0 -> 7.1 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: Wed, 07 Jan 2009 06:35:57 -0000 Yuri Pankov wrote: > On Wed, Jan 07, 2009 at 07:06:53AM +0100, Peter Boosten wrote: >> >> Also: most scripts updated by mergemaster during 7.0->7.1 are only >> version numbering diffs. Is there no smarter way to do this, apart from >> typing 'i' every time? > > I think you want -U option (auto upgrade files that have not been > modified by user) along with -i (install missing files). After reading the man page the -s option seems to be more appropriate (unless I misread that bit, of course :-) ). Peter -- http://www.boosten.org