]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit - sys/dev/mcd/mcd.c
Since contrib/libcxxrt's ancestry was never correct, subversion 1.8 and
authorDimitry Andric <dim@FreeBSD.org>
Thu, 5 May 2016 22:30:00 +0000 (22:30 +0000)
committerDimitry Andric <dim@FreeBSD.org>
Thu, 5 May 2016 22:30:00 +0000 (22:30 +0000)
commitb030804380c1c8400681ee21ba371d9d06916697
tree29e5b04d28fc642267d56b82b45a237b92fda1c3
parent82cb5c3b5b970872a2925962b62b89d3d26408cf
parent17a515e2228cbf097267b0d4ceabd64c1ae7ddb4
Since contrib/libcxxrt's ancestry was never correct, subversion 1.8 and
higher cannot merge to it from the vendor area.

Re-bootstrap the ancestry by doing (apologies to your retinas):
* svn pg svn:mergeinfo contrib/libcxxrt > mergeinfo.txt
* svn rm contrib/libcxxrt
* svn cp ^/vendor/libcxxrt/dist@297299 contrib/libcxxrt
* svn rm CMakeLists.txt doxygen_config
* svn cp ^/head/contrib/libcxxrt/FREEBSD-upgrade@297299 contrib/libcxxrt
* svn cp ^/head/contrib/libcxxrt/exception.cc@297299 contrib/libcxxrt
* svn cp ^/head/contrib/libcxxrt/unwind-arm.h@297299 contrib/libcxxrt
* svn pd -R svn:mergeinfo contrib/libcxxrt
* svn ps -F mergeinfo.txt svn:mergeinfo contrib/libcxxrt