Date: Fri, 10 Nov 2000 00:51:37 +0000 (UTC) From: naddy@mips.inka.de (Christian Weisgerber) To: freebsd-current@freebsd.org Subject: Re: mergemaster and $FreeBSD$ Message-ID: <8ufgqp$dj1$1@kemoauc.mips.inka.de> References: <200011090226.eA92Qw800408@curve.dellroad.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Archie Cobbs <archie@dellroad.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8ufgqp$dj1$1>