Date: Wed, 6 Jun 2018 02:37:52 +0700 From: Eugene Grosbein <eugen@grosbein.net> To: Konstantin Belousov <kostikbel@gmail.com> Cc: Brad Davis <brd@FreeBSD.org>, Alexander Leidinger <Alexander@leidinger.net>, rgrimes@freebsd.org, Kyle Evans <kevans@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r334617 - in head: . etc Message-ID: <5B16E690.4060406@grosbein.net> In-Reply-To: <20180605192844.GO2450@kib.kiev.ua> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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 :-)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5B16E690.4060406>