From owner-freebsd-stable  Sat Jul  6 18:12:31 2002
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7AADD37B400
	for <freebsd-stable@FreeBSD.ORG>; Sat,  6 Jul 2002 18:12:29 -0700 (PDT)
Received: from mail-relay1.yahoo.com (mail-relay1.yahoo.com [216.145.48.34])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3EF0343E09
	for <freebsd-stable@FreeBSD.ORG>; Sat,  6 Jul 2002 18:12:29 -0700 (PDT)
	(envelope-from DougB@FreeBSD.org)
Received: from FreeBSD.org (12-234-90-219.client.attbi.com [12.234.90.219])
	by mail-relay1.yahoo.com (Postfix) with ESMTP
	id D25228B5E3; Sat,  6 Jul 2002 18:12:28 -0700 (PDT)
Message-ID: <3D27957C.63D53494@FreeBSD.org>
Date: Sat, 06 Jul 2002 18:12:28 -0700
From: Doug Barton <DougB@FreeBSD.org>
Organization: Triborough Bridge & Tunnel Authority
X-Mailer: Mozilla 4.79 [en] (X11; U; FreeBSD 4.6-RELEASE i386)
X-Accept-Language: en
MIME-Version: 1.0
To: Roelof Osinga <roelof@eboa.com>
Cc: freebsd-stable@FreeBSD.ORG
Subject: Re: mergemaster bummer
References: <3D277D4B.4080808@eboa.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-stable.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-stable>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-stable>
X-Loop: FreeBSD.ORG

Roelof Osinga wrote:
> 
> AKA Hi Doug,
> 
> This I stumbled upon when I upgraded a system in the "mergemaster -p" fase:
> 
>      *** How should I deal with the merged file? [Leave it for later] r
> # $FreeBSD: src/etc/group,v 1.19.2.1  | # $FreeBSD: src/etc/group,v 1.19.2.3
> %r
> wheel:*:0:root,roelof,jc,hans         | wheel:*:0:root
> %l
> staff:*:20:root,roelof,jc,hans        | staff:*:20:root
>                                        > sshd:*:22:
> %
> 
> Ah, so that's why the previous system did not show this 'minor detail'.
> It had the default staff group :).
> 
> Of course one can opt for the "e l" or so option, which I did, but it was
> the very first time, I think, that I "needed" that specific feature.

You should read the man page for sdiff. eb handles this situation
nicely.

Doug

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message