1This document contains a collection of notes specific to the import 2of pjdfstest into head. These notes are built on the instructions in 3the FreeBSD Subversion Primer that detail how to deal with vendor 4branches and you are supposed to follow those: 5 6 http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html 7 8The pjdfstest source code is hosted on GitHub: 9 10 https://github.com/pjd/pjdfstest 11 12and is imported into the pjdfstest vendor branch (see base/vendor/pjdfstest/). 13 14To merge the vendor branch into head do something like this: 15 16 cd .../base/head/contrib/pjdfstest 17 svn merge --accept=postpone \ 18 svn+ssh://svn.freebsd.org/base/vendor/pjdfstest/dist . 19 20and resolve any conflicts that may arise at this point. 21 22Lastly, with the list of old and new files in this import, make sure 23to update the reachover Makefiles accordingly. 24