From owner-svn-src-all@freebsd.org Tue Jun 5 19:38:20 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C9537FF3CEF for ; Tue, 5 Jun 2018 19:38:20 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from hz.grosbein.net (unknown [IPv6:2a01:4f8:d12:604::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "hz.grosbein.net", Issuer "hz.grosbein.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 372606E6D2; Tue, 5 Jun 2018 19:38:20 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from eg.sd.rdtc.ru (root@eg.sd.rdtc.ru [62.231.161.221] (may be forged)) by hz.grosbein.net (8.15.2/8.15.2) with ESMTPS id w55Jc0AV047550 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 5 Jun 2018 21:38:01 +0200 (CEST) (envelope-from eugen@grosbein.net) X-Envelope-From: eugen@grosbein.net X-Envelope-To: svn-src-head@freebsd.org Received: from [10.58.0.4] ([10.58.0.4]) by eg.sd.rdtc.ru (8.15.2/8.15.2) with ESMTPS id w55JbvZ6003170 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Wed, 6 Jun 2018 02:37:57 +0700 (+07) (envelope-from eugen@grosbein.net) Subject: Re: svn commit: r334617 - in head: . etc To: Konstantin Belousov References: <201806041847.w54IlCUu097084@pdx.rh.CN85.dnsmgr.net> <1528138550.3632147.1396107464.614818A8@webmail.messagingengine.com> <20180605150022.Horde.emnJxb8rKYqAvChLgWoX9vf@webmail.leidinger.net> <1528212242.2273706.1397239144.6BEBF1F9@webmail.messagingengine.com> <20180605164627.GM2450@kib.kiev.ua> <1528222385.2736229.1397446048.17853CA8@webmail.messagingengine.com> <20180605182605.GN2450@kib.kiev.ua> <5B16D8C4.10809@grosbein.net> <20180605192844.GO2450@kib.kiev.ua> Cc: Brad Davis , Alexander Leidinger , rgrimes@freebsd.org, Kyle Evans , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Eugene Grosbein Message-ID: <5B16E690.4060406@grosbein.net> Date: Wed, 6 Jun 2018 02:37:52 +0700 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: <20180605192844.GO2450@kib.kiev.ua> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=2.2 required=5.0 tests=BAYES_00, LOCAL_FROM, RDNS_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.1 X-Spam-Report: * -0.0 SPF_PASS SPF: sender matches SPF record * -2.3 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 2.6 LOCAL_FROM From my domains * 1.9 RDNS_NONE Delivered to internal network by a host with no rDNS X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on hz.grosbein.net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2018 19:38:21 -0000 06.06.2018 2:28, Konstantin Belousov wrote: >> I found that "mergemaster -iFUP" deals with unchanged files including mentioned rc* scripts just fine. >> That is, it automatically refreshes unchanged files without any silly questions just for change of $FreeBSD$. > > No, you missed the point. Whatever nice is the handling of unchanged files, > use of mergemaster forces me to handle changed files, which is exactly > what I do not want/need to do. Yes, I update crashboxes very often, and > I want to get all new code, including the startup scripts, when I update. "Changed" means "local copy changed by hands", not "changed in the repository". "mergemaster -iFUP" installs all new changes from the repo without questions for files untouched locally since last invocation of such mergemaster, so you get what you want :-)