From owner-svn-src-all@FreeBSD.ORG  Tue Dec 21 08:55:51 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6BB94106567A;
	Tue, 21 Dec 2010 08:55:51 +0000 (UTC)
	(envelope-from alexander@leidinger.net)
Received: from mail.ebusiness-leidinger.de (mail.ebusiness-leidinger.de
	[217.11.53.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 15CEA8FC0C;
	Tue, 21 Dec 2010 08:55:50 +0000 (UTC)
Received: from outgoing.leidinger.net (p57B3AD6F.dip.t-dialin.net
	[87.179.173.111])
	by mail.ebusiness-leidinger.de (Postfix) with ESMTPSA id B9DD6844010;
	Tue, 21 Dec 2010 09:55:47 +0100 (CET)
Received: from unknown (IO.Leidinger.net [192.168.2.110])
	by outgoing.leidinger.net (Postfix) with ESMTP id 00569293C;
	Tue, 21 Dec 2010 09:55:44 +0100 (CET)
Date: Tue, 21 Dec 2010 09:55:43 +0100
From: Alexander Leidinger <Alexander@Leidinger.net>
To: Ben Kaduk <minimarmot@gmail.com>
Message-ID: <20101221095543.00002e3b@unknown>
In-Reply-To: <AANLkTinHV=FAhF4NuC9TOKX0HPV=XwFnMGAK-q+mG2=Y@mail.gmail.com>
References: <201012201517.oBKFHYa6061623@svn.freebsd.org>
	<AANLkTinHV=FAhF4NuC9TOKX0HPV=XwFnMGAK-q+mG2=Y@mail.gmail.com>
X-Mailer: Claws Mail 3.7.6 (GTK+ 2.16.0; i586-pc-mingw32msvc)
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
X-EBL-MailScanner-Information: Please contact the ISP for more information
X-EBL-MailScanner-ID: B9DD6844010.A6672
X-EBL-MailScanner: Found to be clean
X-EBL-MailScanner-SpamCheck: not spam, spamhaus-ZEN,
	SpamAssassin (not cached, score=-0.923, required 6,
	autolearn=disabled, ALL_TRUSTED -1.00, TW_SV 0.08)
X-EBL-MailScanner-From: alexander@leidinger.net
X-EBL-MailScanner-Watermark: 1293526548.51072@0oaJksRnwm2xo/6tJA2wzA
X-EBL-Spam-Status: No
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
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Dec 2010 08:55:51 -0000

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.