svn commit: r230363 - in head/lib/libc/softfloat: . bits32 bits64

John Baldwin jhb at freebsd.org
Fri Jan 20 14:52:48 UTC 2012


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 at 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.

-- 
John Baldwin


More information about the svn-src-all mailing list