Lines Matching +full:merge +full:- +full:base
6 http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html
12 and is imported into the atf vendor branch (see base/vendor/atf/).
14 To merge the vendor branch into head do something like this:
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)
32 --prefix=/ \
33 --exec-prefix=/usr \
34 --datarootdir=/usr/share
35 cp bconfig.h .../base/head/contrib/atf/