From owner-freebsd-jail@FreeBSD.ORG  Wed Jan 29 14:04:04 2014
Return-Path: <owner-freebsd-jail@FreeBSD.ORG>
Delivered-To: freebsd-jail@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D8C5A929
 for <freebsd-jail@freebsd.org>; Wed, 29 Jan 2014 14:04:04 +0000 (UTC)
Received: from mail.0x20.net (mail.0x20.net [217.69.76.211])
 (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9EB851C9C
 for <freebsd-jail@freebsd.org>; Wed, 29 Jan 2014 14:04:04 +0000 (UTC)
Received: from 0x20.net (0x20.net [217.69.76.212]) (Authenticated sender: lala)
 by mail.0x20.net (Postfix) with ESMTPA id D48526A6006
 for <freebsd-jail@freebsd.org>; Wed, 29 Jan 2014 15:04:02 +0100 (CET)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8;
 format=flowed
Content-Transfer-Encoding: 8bit
Date: Wed, 29 Jan 2014 15:04:02 +0100
From: Lars Engels <lars.engels@0x20.net>
To: freebsd-jail@freebsd.org
Subject: Re: fast way to update jails (FreeBSD 10.0 host)
In-Reply-To: <4E3ABB5B-6CBC-48AD-AF07-861493E5CAD3@inbox.im>
References: <312B2F04-D8B3-4B96-968B-486A499A44B8@inbox.im>
 <1390996133.249345676.92g0496f@frv34.ukr.net>
 <4E3ABB5B-6CBC-48AD-AF07-861493E5CAD3@inbox.im>
Message-ID: <4cbe0ff593ba1778bcd8d951e1314f4d@mail.0x20.net>
X-Sender: lars.engels@0x20.net
User-Agent: Roundcube Webmail/0.7
X-BeenThere: freebsd-jail@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "Discussion about FreeBSD jail\(8\)" <freebsd-jail.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-jail>,
 <mailto:freebsd-jail-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-jail/>
List-Post: <mailto:freebsd-jail@freebsd.org>
List-Help: <mailto:freebsd-jail-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-jail>,
 <mailto:freebsd-jail-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Jan 2014 14:04:04 -0000

Am 2014-01-29 13:46, schrieb Nicolas de Bari Embriz Garcia Rojas:
> Hi, I avoid mergemaster since ask for to  many changes, it is faster
> for me some times  just copy  /etc.old —> /etc important files, but
> this maybe because I am using the bad flags.
> 
> Can you please give me a tip or some good flags that I should use when
> using mergemaster.
> 
> thanks in advance.
> 

mergemaster -FUi automatically merges a lot of stuff leaving only the 
relevant
changes for manual merge.