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
45 .Pa ( /usr/pkgsrc/devel/scmgit ) .
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 .
75 A fresh copy of the repository can be cloned anywhere.
76 Note that the directory to clone into
78 in the following example) must not exist, so all previous work in this
79 directory has to be saved and the directory be removed prior to cloning.
80 Also note that while the main repository is on
82 it is recommended that one of the
84 mirrors be used instead.
86 Simple setup and updating of local repository is done using
88 .Bd -literal -offset 4n
91 make src-checkout # initial setup
95 Somewhat finer control can be achieved using
98 To clone the repository and check out the master branch (this will take
100 .Bd -literal -offset 4n
102 git clone -o crater git://crater.dragonflybsd.org/dragonfly.git src
106 The repository can be held up to date by pulling frequently (to set up a
112 .Bd -literal -offset 4n
117 It is not recommended to work directly in the master branch.
118 To create and checkout a working branch:
119 .Bd -literal -offset 4n
123 To create and checkout a branch of the
127 .Bd -literal -offset 4n
128 git checkout -b rel2_0 crater/DragonFly_RELEASE_2_0
131 Branches can be deleted just as easy:
132 .Bd -literal -offset 4n
136 After changes have been made to a branch, they can be committed:
137 .Bd -literal -offset 4n
141 .Xr git-commit 1 Ap s
145 options can be used to specify a commit message on the command line or read
146 it from a file, respectively.
148 Finally, branches can be merged with the (updated) master by using
150 .Bd -literal -offset 4n
157 When importing vendor sources, make sure that you don't import
158 too many unnecessary sources.
159 Especially test suites that are not used by the
161 build are good candidates for being stripped away.
162 These instructions assume that you have already extracted
163 the source package into its final directory and that they are
164 trimmed appropriately.
166 .Em \&Do not change the vendor sources before importing them
167 on the vendor branch!
168 Necessary changes to the vendor sources can be applied to
172 For the following commands, we will import the imaginary package
175 .Pa /usr/src/contrib/foo .
176 If this is the first import of
178 you will have to choose the name of the vendor branch.
179 Customarily, this will be
181 However, if you intend to maintain multiple vendor sources for the
184 you should choose a branch name which includes part of the version,
188 As a first step, we trick git to work on the vendor branch instead of on
190 Be careful, since after issuing this command all your commits will go to the
191 vendor branch, but you will commit
192 .Em the whole working tree
193 and not just the vendor sources!
194 Thus you have to specify the exact directory for
196 In order to commit, you will have to add the new sources first.
198 If the vendor branch already exists, make sure that you have a local vendor
199 branch which is up to date.
201 .Bd -literal -offset 4n
202 git update-ref refs/heads/vendor/FOO origin/vendor/FOO
205 The next commands perform the actual import.
206 .Bd -literal -offset 4n
207 git symbolic-ref HEAD refs/heads/vendor/FOO
209 git commit -m "Import foo-2.3" contrib/foo
212 With these commands we have imported the vendor sources on their own branch.
213 In the next step, we merge the vendor branch into master.
214 .Bd -literal -offset 4n
219 Now you are free to change the sources in contrib/foo, since you are
223 The first thing to do is to add
227 The former documents how the imported sources can be obtained, including
228 a checksum of the tarball.
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.
236 first, then commit your local changes to the sources:
237 .Bd -literal -offset 4n
238 git add contrib/foo/README.D*
239 git commit -m "foo: add our READMEs"
242 Finally, push master and the vendor branch to crater:
243 .Bd -literal -offset 4n
244 git push crater master vendor/FOO
247 .Xr git 1 Pq Pa pkgsrc/devel/scmgit ,
252 .%T "Documentation on git's page"
253 .%O "http://git-scm.com/documentation"
257 .%O "http://www-cs-students.stanford.edu/~blynn/gitmagic/"
262 manual page was originally written by
263 .An Matthew Dillon Aq dillon@FreeBSD.org
268 It was rewritten when