1272057Sngie$FreeBSD$ 2272057Sngie 3272057SngieThis document contains a collection of notes specific to the import 4272057Sngieof pjdfstest into head. These notes are built on the instructions in 5272057Sngiethe FreeBSD Subversion Primer that detail how to deal with vendor 6272057Sngiebranches and you are supposed to follow those: 7272057Sngie 8272057Sngie http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html 9272057Sngie 10272057SngieThe pjdfstest source code is hosted on GitHub: 11272057Sngie 12272057Sngie https://github.com/pjd/pjdfstest 13272057Sngie 14272057Sngieand is imported into the pjdfstest vendor branch (see base/vendor/pjdfstest/). 15272057Sngie 16272057SngieTo merge the vendor branch into head do something like this: 17272057Sngie 18272057Sngie cd .../base/head/contrib/pjdfstest 19272057Sngie svn merge --accept=postpone \ 20272057Sngie svn+ssh://svn.freebsd.org/base/vendor/pjdfstest/dist . 21272057Sngie 22272057Sngieand resolve any conflicts that may arise at this point. 23272057Sngie 24272057SngieLastly, with the list of old and new files in this import, make sure 25272057Sngieto update the reachover Makefiles accordingly. 26