Date: Tue, 27 Jan 2015 20:50:39 -0600 From: Andrew Gould <andrewlylegould@gmail.com> To: "Brian W." <brian@brianwhalen.net> Cc: FreeBSD Mailing List <freebsd-questions@freebsd.org> Subject: Re: freebsd-update questions Message-ID: <CAFKhKgoR5wv2Fvv6P6NKCNBjVUQwQ304iQ%2BR3gSj2qCW4FYgzg@mail.gmail.com> In-Reply-To: <CADV=szU%2B2-yhe5skeDHtPNUrxzNKcJsMW=GjMLCha5xBJYnUiA@mail.gmail.com> References: <CAFKhKgqaHbzWRpxBginmH91s2YVgtzZZsAdHX2T_5OjdnQ1Qag@mail.gmail.com> <54B37A5F.5050302@infracaninophile.co.uk> <CAFKhKgpEsKLBRh8zqPyTJOCPbeM7wJrpPHKOSL2Bw7mBqTR4%2BQ@mail.gmail.com> <CADV=szU%2B2-yhe5skeDHtPNUrxzNKcJsMW=GjMLCha5xBJYnUiA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Jan 12, 2015 at 12:46 PM, Brian W. <brian@brianwhalen.net> wrote: > A key thing to watch for in the conf files is that markers will be put in > place so you can see what's new; those need to be deleted. > When I attempted an upgrade to 10.1-RELEASE, I got a message that certain configuration files couldn't be merged and that I should hit the enter button to merge them manually in vi. In vi, the first line was a series of left pointing arrows and a reference to version 10.0. That was followed by the content of the new configuration file. (I think it was new because the lines I added to the existing files weren't there.) The last line was a series of right pointing errors and a reference to version 10.1. What am I supposed to do to keep the old configuration file contents? There are no instructions. Thanks, Andrew
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFKhKgoR5wv2Fvv6P6NKCNBjVUQwQ304iQ%2BR3gSj2qCW4FYgzg>