1This document contains a collection of notes specific to the import
2of atf into head.  These notes are built on the instructions in
3the 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 ATF source code is hosted on GitHub:
9
10	https://github.com/jmmv/atf
11
12and is imported into the atf vendor branch (see base/vendor/atf/).
13
14To merge the vendor branch into head do something like this:
15
16	cd .../base/head/contrib/atf
17	svn merge --accept=postpone \
18	    svn+ssh://svn.freebsd.org/base/vendor/atf/dist .
19	svn remove --force $(cat FREEBSD-Xlist)
20
21and resolve any conflicts that may arise at this point.
22
23Once this is done, you must regenerate bconfig.h.  The recommended way
24of doing so is by using the release files already imported into the
25vendor branch (which is a good justification for importing the verbatim
26sources in the first place so that this step is reproducible).  You can
27use a set of commands similar to the following:
28
29	mkdir /tmp/atf
30	cd /tmp/atf
31	.../vendor/atf/dist/configure \
32	    --prefix=/ \
33	    --exec-prefix=/usr \
34	    --datarootdir=/usr/share
35	cp bconfig.h .../base/head/contrib/atf/
36
37Please do NOT run './configure' straight from the 'dist' directory of
38the vendor branch as you easily risk committing build products into the
39tree.
40
41Lastly, with the list of old and new files in this import, make sure
42to update the reachover Makefiles accordingly.
43
44Test the build (keeping in mind the WITH_TESTS/WITHOUT_TESTS knobs) and,
45if all looks good, you are ready to commit all the changes in one go.
46