blob: eff295fbfdc0be2da56908295b4d6bc8cf197adc (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
$FreeBSD$
This document contains a collection of notes specific to the import
of pjdfstest into head. These notes are built on the instructions in
the FreeBSD Subversion Primer that detail how to deal with vendor
branches and you are supposed to follow those:
http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html
The pjdfstest source code is hosted on GitHub:
https://github.com/pjd/pjdfstest
and is imported into the pjdfstest vendor branch (see base/vendor/pjdfstest/).
To merge the vendor branch into head do something like this:
cd .../base/head/contrib/pjdfstest
svn merge --accept=postpone \
svn+ssh://svn.freebsd.org/base/vendor/pjdfstest/dist .
and resolve any conflicts that may arise at this point.
Lastly, with the list of old and new files in this import, make sure
to update the reachover Makefiles accordingly.
|
