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