svn commit: r271371 - user/ngie/add-pjdfstest/contrib/pjdfstest
ngie at FreeBSD.org
Wed Sep 10 09:42:11 UTC 2014
Date: Wed Sep 10 09:42:10 2014
New Revision: 271371
Create contrib/pjdfstest/FREEBSD-Upgrade from contrib/atf/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 @@
+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:
+The pjdfstest source code is hosted on GitHub:
+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.
More information about the svn-src-user