From owner-freebsd-questions@FreeBSD.ORG  Wed Jan 28 02:50:42 2015
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 764E6447
 for <freebsd-questions@freebsd.org>; Wed, 28 Jan 2015 02:50:42 +0000 (UTC)
Received: from mail-lb0-x234.google.com (mail-lb0-x234.google.com
 [IPv6:2a00:1450:4010:c04::234])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id E749E5EF
 for <freebsd-questions@freebsd.org>; Wed, 28 Jan 2015 02:50:41 +0000 (UTC)
Received: by mail-lb0-f180.google.com with SMTP id b6so16329159lbj.11
 for <freebsd-questions@freebsd.org>; Tue, 27 Jan 2015 18:50:39 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=TKuQuwmTUROwyzQSwtcPYfRX+SnpxrshZN5FZ7eS0+k=;
 b=W+vcz0lOklK+oz0pWT+ivDVtrYWQ+PuBafHUzGB7oulKkHugC3GEd6aL2Z4Pe1UT5Y
 n97RZWc4FK2cf4a6aeQXpaDgt1XKTTwSJHwPrZlgUbARtwdnUVXDOTC4x+gVlE8EMD9D
 dXHEZ+fd6IEQTvimsYwVjudNQW29X/KhQ8iTEst1esz/5uLNPGHlv5Qkz/ryImUMBL8K
 lx1TPyBkBokrUMqYmWWFcoByHWNJBwesgG6IBrIzrrqPiPZcoj6U3YPy5VR4/vvYvkhO
 hfRRO5Z6eX3klCbHRUhwFc2s1niidWx0DeJ8/OmLZ7Rw7RntZ1pwCH5xL81zm+Xazgam
 6TMQ==
MIME-Version: 1.0
X-Received: by 10.152.203.230 with SMTP id kt6mr5211927lac.38.1422413439881;
 Tue, 27 Jan 2015 18:50:39 -0800 (PST)
Received: by 10.25.161.1 with HTTP; Tue, 27 Jan 2015 18:50:39 -0800 (PST)
In-Reply-To: <CADV=szU+2-yhe5skeDHtPNUrxzNKcJsMW=GjMLCha5xBJYnUiA@mail.gmail.com>
References: <CAFKhKgqaHbzWRpxBginmH91s2YVgtzZZsAdHX2T_5OjdnQ1Qag@mail.gmail.com>
 <54B37A5F.5050302@infracaninophile.co.uk>
 <CAFKhKgpEsKLBRh8zqPyTJOCPbeM7wJrpPHKOSL2Bw7mBqTR4+Q@mail.gmail.com>
 <CADV=szU+2-yhe5skeDHtPNUrxzNKcJsMW=GjMLCha5xBJYnUiA@mail.gmail.com>
Date: Tue, 27 Jan 2015 20:50:39 -0600
Message-ID: <CAFKhKgoR5wv2Fvv6P6NKCNBjVUQwQ304iQ+R3gSj2qCW4FYgzg@mail.gmail.com>
Subject: Re: freebsd-update questions
From: Andrew Gould <andrewlylegould@gmail.com>
To: "Brian W." <brian@brianwhalen.net>
Content-Type: text/plain; charset=UTF-8
X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1
Cc: FreeBSD Mailing List <freebsd-questions@freebsd.org>
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions/>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jan 2015 02:50:42 -0000

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