Date: Sun, 07 Jul 2002 01:29:15 +0200 From: Roelof Osinga <roelof@eboa.com> To: freebsd-stable@freebsd.org Subject: mergemaster bummer Message-ID: <3D277D4B.4080808@eboa.com>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3D277D4B.4080808>