From owner-freebsd-current Thu Nov 9 17:30:37 2000 Delivered-To: freebsd-current@freebsd.org Received: from mail.inka.de (quechua.inka.de [212.227.14.2]) by hub.freebsd.org (Postfix) with ESMTP id 37C7237B4CF for ; Thu, 9 Nov 2000 17:30:34 -0800 (PST) Received: from kemoauc.mips.inka.de (uucp@) by mail.inka.de with local-bsmtp id 13u31V-0006pG-00; Fri, 10 Nov 2000 02:30:33 +0100 Received: (from daemon@localhost) by kemoauc.mips.inka.de (8.11.0/8.11.0) id eAA0pbJ14302 for freebsd-current@freebsd.org; Fri, 10 Nov 2000 01:51:37 +0100 (CET) (envelope-from daemon) From: naddy@mips.inka.de (Christian Weisgerber) Subject: Re: mergemaster and $FreeBSD$ Date: Fri, 10 Nov 2000 00:51:37 +0000 (UTC) Message-ID: <8ufgqp$dj1$1@kemoauc.mips.inka.de> References: <200011090226.eA92Qw800408@curve.dellroad.org> Originator: naddy@mips.inka.de (Christian Weisgerber) To: freebsd-current@freebsd.org Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Archie Cobbs wrote: > even worse, mergemaster in some cases seems to be comparing only > the $FreeBSD$ strings and incorrectly concluding that certain > files don't need upgrading, when in fact they do. If the -s switch isn't specified, mergemaster compares id strings first, and if these match it will consider the files equal. This is *very* handy, as it saves you from dealing with your local changes again and again, even though nothing has changed in the corresponding release files. -- Christian "naddy" Weisgerber naddy@mips.inka.de To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message