From owner-freebsd-stable Sat Jul 6 16:29:39 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 4E0F837B400 for ; Sat, 6 Jul 2002 16:29:35 -0700 (PDT) Received: from frl.nisser.com (c0039.upc-c.chello.nl [212.187.0.39]) by mx1.FreeBSD.org (Postfix) with ESMTP id 550DD43E67 for ; Sat, 6 Jul 2002 16:29:21 -0700 (PDT) (envelope-from roelof@eboa.com) Received: from eboa.com (roelof.nisser.com [10.0.0.2]) by frl.nisser.com (Postfix) with ESMTP id 3FFFCEA94 for ; Sun, 7 Jul 2002 01:29:15 +0200 (CEST) Message-ID: <3D277D4B.4080808@eboa.com> Date: Sun, 07 Jul 2002 01:29:15 +0200 From: Roelof Osinga Organization: eBOA - Programming the Web User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.0rc3) Gecko/20020523 X-Accept-Language: en,pdf MIME-Version: 1.0 To: freebsd-stable@freebsd.org Subject: mergemaster bummer Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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. IOW, it was the first time - for me - that it combined mutually incompatible changes. It would be easier for the bone lazy ones amongst us if it did not :). It's not a bug as such, not a change request either. It's just, well, ... something I noticed. I reported it as a thing to ponder, is all. Roelof -- _______________________________________________________________________ eBOAź est. 1982 http://eBOA.com/ tel. +31-58-2123014 mailto:info@eBOA.com?subject=Information_request fax. +31-58-2160293 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message