From owner-freebsd-current@freebsd.org  Sat Aug 11 08:48:36 2018
Return-Path: <owner-freebsd-current@freebsd.org>
Delivered-To: freebsd-current@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD71A1063314
 for <freebsd-current@mailman.ysv.freebsd.org>;
 Sat, 11 Aug 2018 08:48:36 +0000 (UTC) (envelope-from pi@freebsd.org)
Received: from home.opsec.eu (home.opsec.eu [IPv6:2001:14f8:200::1])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7329B71F0B
 for <freebsd-current@freebsd.org>; Sat, 11 Aug 2018 08:48:36 +0000 (UTC)
 (envelope-from pi@freebsd.org)
Received: from pi by home.opsec.eu with local (Exim 4.91 (FreeBSD))
 (envelope-from <pi@freebsd.org>)
 id 1foPZZ-0008yM-N9; Sat, 11 Aug 2018 10:48:33 +0200
Date: Sat, 11 Aug 2018 10:48:33 +0200
From: Kurt Jaeger <pi@freebsd.org>
To: Graham Perrin <grahamperrin@gmail.com>
Cc: freebsd-current@freebsd.org
Subject: Re: Unexpected results with 'mergemaster -Ui'
Message-ID: <20180811084833.GK2118@home.opsec.eu>
References: <0d409d71-5200-b475-34fc-16fa72861b13@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <0d409d71-5200-b475-34fc-16fa72861b13@gmail.com>
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Aug 2018 08:48:37 -0000

Hi!

> <https://pastebin.com/m7q8dpWB> line 133 onwards, for example.
> 
> I never before found any potential change to
> /etc/group
> 
> Please, is it unusual?

No, it is normal, that happens if you have local changes.
I suggest you discard the incoming /etc/group and go with your
current version and the local changes.

-- 
pi@FreeBSD.org         +49 171 3101372              2 years to go !