Archie Cobbs <[EMAIL PROTECTED]> 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                          [EMAIL PROTECTED]

To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message

Reply via email to