Date: Sat, 06 Jul 2002 18:12:28 -0700 From: Doug Barton <DougB@FreeBSD.org> To: Roelof Osinga <roelof@eboa.com> Cc: freebsd-stable@FreeBSD.ORG Subject: Re: mergemaster bummer Message-ID: <3D27957C.63D53494@FreeBSD.org> References: <3D277D4B.4080808@eboa.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3D27957C.63D53494>