svn commit: r243798 - head

[Garrett Cooper]

On Sun, Dec 2, 2012 at 2:13 PM, Robert Watson <rwatson at freebsd.org> wrote:

...

> I've also added an UPDATING entry.
>
> Note that running "mergemaster -p" is a documented (and necessary) part of
> the world upgrade process.  Normally I wouldn't add an UPDATING entry, and
> in general we haven't done it for new users in the past, but it seems an
> inordinate number of people are running into this due to not using
> "mergemaster -p" (and on the whole not removing their feet), so a reminder
> was necessary.

Unfortunately I also propogated this fallacy (not needing mergemaster
-p) as well.

I'm rerunning a build with nanobsd on my 9/stable workstation, as I
ran into problems in the last go-around with the user/group being
missing, but we'll see if I run into it again (seems like we should
have a slightly more intelligent mechanism for dealing with this issue
in the build system itself instead of mergemaster).

Thanks!
-Garrett