1$FreeBSD: head/contrib/atf/FREEBSD-upgrade 258286 2013-11-17 23:19:06Z jmmv $
| 1$FreeBSD: head/contrib/atf/FREEBSD-upgrade 272046 2014-09-23 22:20:19Z rodrigc $
|
2
3This document contains a collection of notes specific to the import
4of atf into head. These notes are built on the instructions in
5the 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
| 2
3This document contains a collection of notes specific to the import
4of atf into head. These notes are built on the instructions in
5the 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 ATF source code is hosted on Google Code as a subcomponent of the
11Kyua project:
| 10The ATF source code is hosted on GitHub:
|
12
| 11
|
13 http://code.google.com/p/kyua/downloads/list
| 12 https://github.com/jmmv/atf
|
14
15and is imported into the atf vendor branch (see base/vendor/atf/).
16
17To merge the vendor branch into head do something like this:
18
19 cd .../base/head/contrib/atf
20 svn merge --accept=postpone \
21 svn+ssh://svn.freebsd.org/base/vendor/atf/dist .
--- 27 unchanged lines hidden --- | 13
14and is imported into the atf vendor branch (see base/vendor/atf/).
15
16To merge the vendor branch into head do something like this:
17
18 cd .../base/head/contrib/atf
19 svn merge --accept=postpone \
20 svn+ssh://svn.freebsd.org/base/vendor/atf/dist .
--- 27 unchanged lines hidden --- |