Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Dec 2010 09:55:43 +0100
From:      Alexander Leidinger <Alexander@Leidinger.net>
To:        Ben Kaduk <minimarmot@gmail.com>
Cc:        svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Alexander Leidinger <netchild@freebsd.org>
Subject:   Re: svn commit: r216591 - head
Message-ID:  <20101221095543.00002e3b@unknown>
In-Reply-To: <AANLkTinHV=FAhF4NuC9TOKX0HPV=XwFnMGAK-q%2BmG2=Y@mail.gmail.com>
References:  <201012201517.oBKFHYa6061623@svn.freebsd.org> <AANLkTinHV=FAhF4NuC9TOKX0HPV=XwFnMGAK-q%2BmG2=Y@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 20 Dec 2010 19:42:51 -0500 Ben Kaduk <minimarmot@gmail.com>
wrote:

> On Mon, Dec 20, 2010 at 10:17 AM, Alexander Leidinger
> <netchild@freebsd.org> wrote:
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> > --- head/UPDATING =A0 =A0 =A0 Mon Dec 20 14:54:24 2010 =A0 =A0 =A0 =A0(=
r216590)
> > +++ head/UPDATING =A0 =A0 =A0 Mon Dec 20 15:17:34 2010 =A0 =A0 =A0 =A0(=
r216591)
> > @@ -1136,8 +1136,8 @@ COMMON ITEMS:
> > =A0 =A0 =A0 =A0<reboot in single user> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 [3]
> > =A0 =A0 =A0 =A0mergemaster -p =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0[5]
> > =A0 =A0 =A0 =A0make installworld
> > - =A0 =A0 =A0 make delete-old
> > =A0 =A0 =A0 =A0mergemaster -i =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0[4]
> > + =A0 =A0 =A0 make delete-old =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 [6]
> > =A0 =A0 =A0 =A0<reboot>
>=20
> 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.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101221095543.00002e3b>