]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit - sys/dev/mcd/mcd.c
Since contrib/libcxxrt's ancestry was never correct, subversion 1.8 and
authordim <dim@FreeBSD.org>
Thu, 5 May 2016 22:30:00 +0000 (22:30 +0000)
committerdim <dim@FreeBSD.org>
Thu, 5 May 2016 22:30:00 +0000 (22:30 +0000)
commit68d7e14c1b8fc2f6a8c21ef0402dff5f42ae129b
tree29e5b04d28fc642267d56b82b45a237b92fda1c3
parenteb663acb54bc8677cc47448aa68f2e2393d5455b
parent3f046c442a0e8883a282ffef35f1ad99d44499b2
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