From owner-svn-src-head@FreeBSD.ORG Fri Jan 20 19:38:31 2012 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 9E5F9106566B; Fri, 20 Jan 2012 19:38:31 +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 6F80E8FC0C; Fri, 20 Jan 2012 19:38:31 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) by cyrus.watson.org (Postfix) with ESMTPSA id 26A7C46B2C; Fri, 20 Jan 2012 14:38:31 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 7E4E6B93F; Fri, 20 Jan 2012 14:38:30 -0500 (EST) From: John Baldwin To: David Schultz Date: Fri, 20 Jan 2012 14:37:52 -0500 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p10; KDE/4.5.5; amd64; ; ) References: <201201200616.q0K6GEwT026852@svn.freebsd.org> <201201200753.13232.jhb@freebsd.org> <20120120181108.GA39735@zim.MIT.EDU> In-Reply-To: <20120120181108.GA39735@zim.MIT.EDU> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201201201437.52252.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 20 Jan 2012 14:38:30 -0500 (EST) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r230363 - in head/lib/libc/softfloat: . bits32 bits64 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: Fri, 20 Jan 2012 19:38:31 -0000 On Friday, January 20, 2012 1:11:08 pm David Schultz wrote: > On Fri, Jan 20, 2012, John Baldwin wrote: > > On Friday, January 20, 2012 1:50:06 am David Schultz wrote: > > > On Fri, Jan 20, 2012, David Schultz wrote: > > > > Merge in the latest SoftFloat changes from NetBSD. (NetBSD isn't the > > > > original vendor, but we're using their heavily modified version.) > > > > This brings in functions for long double emulation (both extended and > > > > quad formats), which may be useful for testing, and also for replacing > > > > libc/sparc64/fpu/. > > > > > > I'd appreciate it if an svn guru could let me know if anything > > > needs to be done to record the fact that this is a merged copy of > > > /vendor/NetBSD/softfloat/dist@230364. `svn merge --record-only $url' > > > didn't do anything, I'm guessing because there's no history yet. > > > The previous libc/softfloat sources were a mishmash, so I didn't try > > > to recreate any merge history for those. > > > > Did you use 'svn cp' to add the bits in from the vendor tree? If so, there's > > no need to do an record-only merge. In general we only need to do record-only > > merge to bootstrap mergeinfo when doing the first merge for a vendor tree > > after the CVS -> SVN conversion. For new vendor sources that are 'svn cp'd > > from the vendor area, SVN will just DTRT from the start. > > Unfortunately, no. The prior contents of the directory were taken > from NetBSD at different points in time as early as 2002 and then > modified. I updated them to a consistent snapshot outside of svn, > and then decided only in retrospect that it would be nice to be > able to track the vendor sources in the tree directly. Hmm, but when you added the files in this commit, did you just do a local 'svn add' of files you had, or did you do an 'svn cp' from the vendor files? -- John Baldwin