Date: Wed, 10 Sep 2014 09:42:11 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r271371 - user/ngie/add-pjdfstest/contrib/pjdfstest Message-ID: <201409100942.s8A9gBcY048219@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Sep 10 09:42:10 2014 New Revision: 271371 URL: http://svnweb.freebsd.org/changeset/base/271371 Log: Create contrib/pjdfstest/FREEBSD-Upgrade from contrib/atf/FREEBSD-Upgrade Added: user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-upgrade Added: user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-upgrade ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/add-pjdfstest/contrib/pjdfstest/FREEBSD-upgrade Wed Sep 10 09:42:10 2014 (r271371) @@ -0,0 +1,25 @@ +$FreeBSD$ + +This document contains a collection of notes specific to the import +of pjdfstest into head. These notes are built on the instructions in +the FreeBSD Subversion Primer that detail how to deal with vendor +branches and you are supposed to follow those: + + http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html + +The pjdfstest source code is hosted on GitHub: + + https://github.com/pjd/pjdfstest + +and is imported into the pjdfstest vendor branch (see base/vendor/pjdfstest/). + +To merge the vendor branch into head do something like this: + + cd .../base/head/contrib/pjdfstest + svn merge --accept=postpone \ + svn+ssh://svn.freebsd.org/base/vendor/pjdfstest/dist . + +and resolve any conflicts that may arise at this point. + +Lastly, with the list of old and new files in this import, make sure +to udpate the reachover Makefiles accordingly.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409100942.s8A9gBcY048219>