From owner-svn-src-head@FreeBSD.ORG Wed Jan 12 21:21:37 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69467106566C; Wed, 12 Jan 2011 21:21:37 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 390118FC0A; Wed, 12 Jan 2011 21:21:37 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 9412446B3B; Wed, 12 Jan 2011 16:21:36 -0500 (EST) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 9A6BA8A009; Wed, 12 Jan 2011 16:21:35 -0500 (EST) From: John Baldwin To: Nathan Whitehorn Date: Wed, 12 Jan 2011 15:59:42 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.4-CBSD-20110107; KDE/4.4.5; amd64; ; ) References: <201101121455.p0CEt3PD092660@svn.freebsd.org> <201101121133.34607.jhb@freebsd.org> <4D2E0B3F.3010402@freebsd.org> In-Reply-To: <4D2E0B3F.3010402@freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201101121559.42808.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Wed, 12 Jan 2011 16:21:35 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.9 required=4.2 tests=BAYES_00 autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bigwig.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r217309 - in head: . contrib/dialog contrib/dialog/po contrib/dialog/samples contrib/dialog/samples/copifuncs contrib/dialog/samples/install gnu/lib gnu/lib/libdialog gnu/lib/libdialog/... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jan 2011 21:21:37 -0000 On Wednesday, January 12, 2011 3:12:47 pm Nathan Whitehorn wrote: > On 01/12/11 10:33, John Baldwin wrote: > > On Wednesday, January 12, 2011 9:55:03 am Nathan Whitehorn wrote: > >> Author: nwhitehorn > >> Date: Wed Jan 12 14:55:02 2011 > >> New Revision: 217309 > >> URL: http://svn.freebsd.org/changeset/base/217309 > >> > >> Log: > >> Update dialog to version 20100428. This changes the license under which > >> dialog is distributed from GPLv2 to LGPLv2 and introduces a number of new > >> features and a new and better libdialog API. The existing libdialog will > >> be kept temporarily as libodialog for compatibility purposes until sade, > >> sysinstall and tzsetup have been either updated or replaced. > >> > >> __FreeBSD_version is now 900030. > > > > Hmm, did you import this to the vendor area first or did you just add it > > directly to contrib? > > I did it wrong, and put it directly into contrib. I'm not sure what is > the best way to fix it. Here are the possibilities that I came up with: > - Fix it when there's an update > - Import it into vendor now for historical purposes > - Import it into vendor and synthesize mergeinfo on contrib/dialog. The last should be fine. Just doing a merge --record-only to bootstrap the mergeinfo should be sufficient. Likely you need to flatten the vendor tree (see the page on the wiki about subversion imports). -- John Baldwin