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