svn commit: r216591 - head

[Alexander Leidinger]

On Mon, 20 Dec 2010 19:42:51 -0500 Ben Kaduk <minimarmot at gmail.com>
wrote:

> On Mon, Dec 20, 2010 at 10:17 AM, Alexander Leidinger
> <netchild at freebsd.org> wrote:
> ==============================================================================
> > --- head/UPDATING       Mon Dec 20 14:54:24 2010        (r216590)
> > +++ head/UPDATING       Mon Dec 20 15:17:34 2010        (r216591)
> > @@ -1136,8 +1136,8 @@ COMMON ITEMS:
> >        <reboot in single user>                         [3]
> >        mergemaster -p                                  [5]
> >        make installworld
> > -       make delete-old
> >        mergemaster -i                                  [4]
> > +       make delete-old                                 [6]
> >        <reboot>
> 
> There is of course the issue of when a file is erroneously listed in
> ObsoleteFiles.inc and deleted by delete-old.  The previous order would
> have installworld come in and correct the error, but the current
> version leaves that file deleted.  So there is something of a
> tradeoff.

delete-old was never before installworld.

Bye,
Alexander.