Date: Wed, 5 Nov 2014 14:29:36 -0500 From: Paul Mather <paul@gromit.dlib.vt.edu> To: =?utf-8?Q?Peter_Ankerst=C3=A5l?= <peter@pean.org> Cc: Scot Hetzel <swhetzel@gmail.com>, FreeBSD Stable <freebsd-stable@freebsd.org> Subject: Re: freebsd-udapte upgrade. Message-ID: <2B820BFF-8565-4A4D-B05E-3A66E8939A52@gromit.dlib.vt.edu> In-Reply-To: <BD86DB4D-1718-4E3F-9F4A-6B3531ED8FBA@pean.org> References: <545A348A.4000908@pean.org> <CACdU%2Bf-vY2DL=2mHGgU7Lggv2zxrhTji4Aoddrh3L=TAvOC-OA@mail.gmail.com> <BD86DB4D-1718-4E3F-9F4A-6B3531ED8FBA@pean.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On Nov 5, 2014, at 1:58 PM, Peter Ankerst=C3=A5l <peter@pean.org> wrote: >=20 >=20 >=20 >>> On 5 nov 2014, at 19:53, Scot Hetzel <swhetzel@gmail.com> wrote: >>>=20 >>> On Wed, Nov 5, 2014 at 8:30 AM, Peter Ankerst=C3=A5l <peter@pean.org> wr= ote: >>> Could someone please explain how to use freebsd-update upgrade without >>> destroying all of your configuration files? >>>=20 >>> I really don't understand how to use the merge function.. In this case i= >>> typed :q for all files it asked about. :wq seem to >>> do about the same thing. Notice that a few of the files has this shit in= >>> multiple places. I can't be right that I should edit every file manually= and >>> look for "current version" and so on? >> Most likely what happened is that when you used :wq it wrote the >> contents of the diff between your current version and the new version >> to your existing configuration files. If you had stuck to using :q, >> it should have left your existing configuration files alone. >=20 > This was done with :q only. I dont get it. When you upgrade using freebsd-update, it will try and update configuration f= iles automatically. If there are any configuration files whose differences c= an't be resolved automatically, it will present that file for editing with t= he merge conflicts in the file presented. You are then supposed to resolved= the conflicts manually. I've always resolved any conflicts, so I've not had any experience if you si= mply ":q" from the editor, thereby leaving in all the conflict markers. If f= reebsd-update doesn't check for unresolved conflicts and force you to edit t= he file again, I presume your configuration file will now basically be inval= id. Maybe this is what happened in your case? Cheers, Paul.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2B820BFF-8565-4A4D-B05E-3A66E8939A52>