Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Jan 2012 14:37:52 -0500
From:      John Baldwin <jhb@freebsd.org>
To:        David Schultz <das@freebsd.org>
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
Message-ID:  <201201201437.52252.jhb@freebsd.org>
In-Reply-To: <20120120181108.GA39735@zim.MIT.EDU>
References:  <201201200616.q0K6GEwT026852@svn.freebsd.org> <201201200753.13232.jhb@freebsd.org> <20120120181108.GA39735@zim.MIT.EDU>

next in thread | previous in thread | raw e-mail | index | archive | help
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



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