Date: Wed, 5 Nov 2014 12:53:06 -0600 From: Scot Hetzel <swhetzel@gmail.com> To: =?ISO-8859-1?Q?Peter_Ankerst=E5l?= <peter@pean.org> Cc: FreeBSD Stable <freebsd-stable@freebsd.org> Subject: Re: freebsd-udapte upgrade. Message-ID: <CACdU%2Bf-vY2DL=2mHGgU7Lggv2zxrhTji4Aoddrh3L=TAvOC-OA@mail.gmail.com> In-Reply-To: <545A348A.4000908@pean.org> References: <545A348A.4000908@pean.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Nov 5, 2014 at 8:30 AM, Peter Ankerst=E5l <peter@pean.org> wrote: > Could someone please explain how to use freebsd-update upgrade without > destroying all of your configuration files? > > 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACdU%2Bf-vY2DL=2mHGgU7Lggv2zxrhTji4Aoddrh3L=TAvOC-OA>