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