diff options
| author | dim <dim@FreeBSD.org> | 2015-09-11 17:14:58 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-09-11 17:14:58 +0000 |
| commit | 2a0c9817c795eaf2bf7607d8cc9b36975aaca160 (patch) | |
| tree | e52e4bab5981d27093e777cdb883b71fcf56c051 /contrib/libc++/include/queue | |
| parent | 9224c7597dd5380acdf3210ab5cadf180f8c23e8 (diff) | |
| parent | 083c980732b44eb899ce399cf182dec9b90b9a1d (diff) | |
| download | FreeBSD-src-2a0c9817c795eaf2bf7607d8cc9b36975aaca160.zip FreeBSD-src-2a0c9817c795eaf2bf7607d8cc9b36975aaca160.tar.gz | |
Since contrib/libc++'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 rm contrib/libc++
* svn cp ^/vendor/libc++/dist@276792 contrib/libc++
* svn cp ^/head/contrib/libc++/FREEBSD-upgrade@287629 contrib/libc++
* svn cp ^/head/contrib/libc++/include/__bit_reference@287629 contrib/libc++/include
* svn cp ^/head/contrib/libc++/include/__config@287629 contrib/libc++/include
* svn cp ^/head/contrib/libc++/include/__tree@287629 contrib/libc++/include
* svn cp ^/head/contrib/libc++/include/algorithm@287629 contrib/libc++/include
* svn cp ^/head/contrib/libc++/include/stdexcept@287629 contrib/libc++/include
* svn cp ^/head/contrib/libc++/include/type_traits@287629 contrib/libc++/include
* svn pd -R svn:mergeinfo contrib/libc++
* svn ps -F mergeinfo.txt contrib/libc++
Diffstat (limited to 'contrib/libc++/include/queue')
0 files changed, 0 insertions, 0 deletions
