From owner-freebsd-stable@FreeBSD.ORG  Wed Nov  5 18:53:09 2014
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 075E398E
 for <freebsd-stable@freebsd.org>; Wed,  5 Nov 2014 18:53:09 +0000 (UTC)
Received: from mail-wg0-x235.google.com (mail-wg0-x235.google.com
 [IPv6:2a00:1450:400c:c00::235])
 (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 96381875
 for <freebsd-stable@freebsd.org>; Wed,  5 Nov 2014 18:53:08 +0000 (UTC)
Received: by mail-wg0-f53.google.com with SMTP id b13so1658872wgh.12
 for <freebsd-stable@freebsd.org>; Wed, 05 Nov 2014 10:53:06 -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:content-transfer-encoding;
 bh=wdY74fOCkaDsxYnZ9KVFh7PZbHAizlTAXwlZr1phmTU=;
 b=Y3HmPSqiAY2ZXWLA+sX+drkqPYdOtMydVEG0Oqar63tuBitN1nPU6ZiKdLEMw/vUQM
 kir6BHC/KuKgtJ0sN8ZGvcvk4/Z4vyZwvBqxe+tDgc3gg+9BLojaIVP1kZMQYsHR7lYl
 QsIUnnBioU/Y5wUOCShkFuQo86EtL9C/cctoPxeqZOBwfUzJ9Rzh4q45q0BsV8reft8D
 ZXvQxp30uUelVzE4Rv5JHQjbTUpNqhFxB2YIuSLFWh4EOdHhs3jzj0nUmzvfpAfP41Uu
 ALm8PjpUR63lliwF+grlyKhg/5arAjJJrVgzPzQ6Wzy4Ef6T0P2SseP1TJQB/LkOh332
 lSXQ==
MIME-Version: 1.0
X-Received: by 10.180.188.41 with SMTP id fx9mr7884397wic.59.1415213586851;
 Wed, 05 Nov 2014 10:53:06 -0800 (PST)
Received: by 10.27.46.14 with HTTP; Wed, 5 Nov 2014 10:53:06 -0800 (PST)
In-Reply-To: <545A348A.4000908@pean.org>
References: <545A348A.4000908@pean.org>
Date: Wed, 5 Nov 2014 12:53:06 -0600
Message-ID: <CACdU+f-vY2DL=2mHGgU7Lggv2zxrhTji4Aoddrh3L=TAvOC-OA@mail.gmail.com>
Subject: Re: freebsd-udapte upgrade.
From: Scot Hetzel <swhetzel@gmail.com>
To: =?ISO-8859-1?Q?Peter_Ankerst=E5l?= <peter@pean.org>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: FreeBSD Stable <freebsd-stable@freebsd.org>
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable/>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Nov 2014 18:53:09 -0000

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.