1$FreeBSD$
2
3This document contains a collection of notes specific to the import
4of the NetBSD test suite into head.  These notes are built on the instructions
5in the 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 NetBSD test source code was originally obtained via NetBSD anoncvs as
11described in the NetBSD handbook:
12
13	http://www.netbsd.org/docs/guide/en/chap-fetch.html#chap-fetch-cvs
14
15and is imported into the NetBSD/tests vendor branch (see
16base/vendor/NetBSD/tests/).
17
18The process used to bootstrap the vendor tree was similar to the following:
19
20	/bin/sh
21	export CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot"
22	cvs -z9 co -D "09/30/2014 20:45" -P src/tests
23	mv src/tests/* tests/dist/.
24
25Please adjust the checkout date spec (the argument passed via -D) to match
26the desired checkout time.
27
28To merge the vendor branch into head do something like this:
29
30	cd .../base/head/contrib/netbsd-tests
31	svn merge --accept=postpone \
32	    svn+ssh://svn.freebsd.org/base/vendor/NetBSD/tests/dist .
33	find . -name Makefile\* | xargs svn rm --force
34
35and resolve any conflicts that may arise at this point.
36
37Lastly, with the list of old and new files in this import, make sure
38to update the reachover Makefiles accordingly.
39