Date: Tue, 10 Mar 2015 12:20:16 -0700 From: "Chris H" <bsd-lists@bsdforge.com> To: Adam Vande More <amvandemore@gmail.com> Cc: "freebsd-stable@freebsd.org" <freebsd-stable@freebsd.org>, Peter Olsson <list-freebsd-stable@jyborn.se> Subject: Re: There has to be a better way of merging /etc during a major freebsd-update Message-ID: <ff88caff820fcf67f3d13355dabd5073@ultimatedns.net> In-Reply-To: <CA%2BtpaK2dhYXzC%2Bim=axcqbeutT8W6BZOWObzGCBX3LsrxKVvYA@mail.gmail.com> References: <20150310120540.GN8223@pol-server.leissner.se> <CA%2BtpaK2QWN4ez%2BjKViQ0=wVxysvrfN-S9qrumEdpF7wwM-822A@mail.gmail.com> <1d4863fa5d3f1374a9fa5f9bd19d01b7@ultimatedns.net>, <CA%2BtpaK2dhYXzC%2Bim=axcqbeutT8W6BZOWObzGCBX3LsrxKVvYA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 10 Mar 2015 14:08:21 -0500 Adam Vande More <amvandemore@gmail.com> wrote > On Tue, Mar 10, 2015 at 2:01 PM, Chris H <bsd-lists@bsdforge.com> wrote: > > > > > > > > > > > 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." > > > > Op asked for a freebsd-update solution which excludes any mergemaster > solution short of at least a partial rewrite. Ahem... right you are! Speaking of reading things, it'd kill me to read more closely, before replying. :P Sorry, Adam. --Chris > > -- > Adam > _______________________________________________ > freebsd-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ff88caff820fcf67f3d13355dabd5073>