Date: Tue, 10 Mar 2015 20:18:49 +0100 From: Peter Olsson <list-freebsd-stable@jyborn.se> To: Chris H <bsd-lists@bsdforge.com> Cc: Adam Vande More <amvandemore@gmail.com>, "freebsd-stable@freebsd.org" <freebsd-stable@freebsd.org> Subject: Re: There has to be a better way of merging /etc during a major freebsd-update Message-ID: <20150310191849.GI9442@pol-server.leissner.se> In-Reply-To: <1d4863fa5d3f1374a9fa5f9bd19d01b7@ultimatedns.net> References: <20150310120540.GN8223@pol-server.leissner.se> <CA%2BtpaK2QWN4ez%2BjKViQ0=wVxysvrfN-S9qrumEdpF7wwM-822A@mail.gmail.com> <1d4863fa5d3f1374a9fa5f9bd19d01b7@ultimatedns.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Mar 10, 2015 at 12:01:54PM -0700, Chris H wrote: > On Tue, 10 Mar 2015 10:17:18 -0500 Adam Vande More <amvandemore@gmail.com> > wrote > > > On Tue, Mar 10, 2015 at 7:05 AM, Peter Olsson <list-freebsd-stable@jyborn.se > > > wrote: > > > > > This flag to mergemaster saved a lot of work when I did > > > upgrades the old way, with cvsup and the make steps and > > > then mergemaster: > > > > > > > https://svnweb.freebsd.org/base?view=revision&revision=221780 > > > > I'd venture to guess the script will work fine on older installs, but > > testing should be done first. > Isn't that pretty much what the -F flag, I mentioned does? > "-F If the files differ only by VCS Id ($FreeBSD) install the > new file." > In all honesty, I too got stuck answering "y" ~100 times, way > back when. And decided I needed to either find a better way, > or see if the mergemaster(8) had any secrets I wasn't > aware of. ;-) I think you are mixing up mergemaster with merge. Freebsd-update uses merge, not mergemaster. (But I will try running freebsd-update without merging /etc, and use mergemaster -F instead. Should solve my problem.) Peter Olsson
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150310191849.GI9442>