3 .\" The DragonFly Project. All rights reserved.
5 .\" Redistribution and use in source and binary forms, with or without
6 .\" modification, are permitted provided that the following conditions
9 .\" 1. Redistributions of source code must retain the above copyright
10 .\" notice, this list of conditions and the following disclaimer.
11 .\" 2. Redistributions in binary form must reproduce the above copyright
12 .\" notice, this list of conditions and the following disclaimer in
13 .\" the documentation and/or other materials provided with the
15 .\" 3. Neither the name of The DragonFly Project nor the names of its
16 .\" contributors may be used to endorse or promote products derived
17 .\" from this software without specific, prior written permission.
19 .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21 .\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
22 .\" FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
23 .\" COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
24 .\" INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
25 .\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
26 .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
27 .\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28 .\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
29 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
37 .Nd quick starter for development with the DragonFly codebase
42 distributed revision control system.
43 If it is not already on the system, it needs to be installed via
49 section gives initial information to get going with development on
53 manual pages and other related documents for further information on git's
54 capabilities and how to use them.
57 section below has some links.
59 For information on how to build the
61 system from source code, see
63 For information on how to build the LiveCD, LiveDVD or thumb drive image, see
66 For a specification of
68 preferred source code style, refer to
72 function to switch C-mode to this style (more or less) can be found in
73 .Pa /usr/share/misc/dragonfly.el .
77 .Pa /usr/share/misc/dragonfly.vim
80 A fresh copy of the repository can be cloned anywhere.
81 Note that the directory to clone into
83 in the following example) must not exist, so all previous work in this
84 directory has to be saved and the directory be removed prior to cloning.
85 Also note that while the main repository is on
87 it is recommended that one of the
89 mirrors be used instead.
91 Simple setup of the local repository is done using
93 .Bd -literal -offset 4n
95 make help # get brief help
96 make src-create # create the source repository
99 Somewhat finer control can be achieved using
102 To clone the repository and check out the master branch (this will take
104 .Bd -literal -offset 4n
106 git clone -o crater git://crater.dragonflybsd.org/dragonfly.git src
110 The repository can be held up to date by pulling frequently (to set up a
116 .Bd -literal -offset 4n
121 It is not recommended to work directly in the master branch.
122 To create and checkout a working branch:
123 .Bd -literal -offset 4n
127 To create and checkout a branch of the
131 .Bd -literal -offset 4n
132 git checkout -b rel2_0 crater/DragonFly_RELEASE_2_0
135 Branches can be deleted just as easy:
136 .Bd -literal -offset 4n
140 After changes have been made to a branch, they can be committed:
141 .Bd -literal -offset 4n
145 .Xr git-commit 1 Ap s
149 options can be used to specify a commit message on the command line or read
150 it from a file, respectively.
152 Finally, branches can be merged with the (updated) master by using
154 .Bd -literal -offset 4n
161 When importing vendor sources, make sure that you don't import
162 too many unnecessary sources.
163 Especially test suites that are not used by the
165 build are good candidates for being stripped away.
166 These instructions assume that you have already extracted
167 the source package into its final directory and trimmed the source
170 .Em \&Do not change the vendor sources before importing them
171 on the vendor branch!
172 Necessary changes to the vendor sources should be applied to the
174 branch after the import.
176 For the following example, we will import the imaginary package
180 If this is the first import of
182 you will have to choose the name of the vendor branch.
183 Customarily, this will be
185 However, if you intend to maintain multiple vendor sources for the
188 you should choose a branch name that includes part of the version, e.g.,
191 First, we need to create an orphan branch (i.e., a new branch with no
192 history) as the vendor branch:
193 .Bd -literal -offset 4n
194 git checkout --orphan vendor/FOO
197 Then we remove the previous content because the vendor branch will only
198 contain the vendor sources to be imported:
199 .Bd -literal -offset 4n
203 Next, move the prepared vendor sources to the destination, i.e.,
205 Then we perform the import:
206 .Bd -literal -offset 4n
208 git commit -m "Import foo-2.3 on the vendor branch"
211 Next, we merge the vendor branch into
213 .Bd -literal -offset 4n
215 git merge --allow-unrelated-histories vendor/FOO
218 Now you are free to change the sources in
220 since you are back to the
223 The first thing to do is to add
227 The former documents how the imported sources can be obtained, including
228 basic information (e.g., version, date, checksum) of the source package.
229 The latter lists all files and directories that have been removed from the
232 .Pa /usr/src/tools/tools/genreadmedeleted/genreadmedeleted
233 shell script to generate this file.
237 .Bd -literal -offset 4n
238 git add contrib/foo/README.D*
239 git commit -m "foo: add our READMEs"
242 And then commit your local changes to the sources.
245 and the vendor branch to the upstream:
246 .Bd -literal -offset 4n
247 git push crater master vendor/FOO
250 .Xr git 1 Pq Pa devel/git ,
255 .%T "Documentation on git's page"
256 .%U "http://git-scm.com/documentation"
260 .%U "http://www-cs-students.stanford.edu/~blynn/gitmagic/"
265 manual page was originally written by
266 .An Matthew Dillon Aq Mt dillon@FreeBSD.org
271 It was rewritten when