1 .\" Copyright (c) 2003,2004 The DragonFly Project. All rights reserved.
3 .\" This code is derived from software contributed to The DragonFly Project
4 .\" by Matthew Dillon <dillon@backplane.com>
6 .\" Redistribution and use in source and binary forms, with or without
7 .\" modification, are permitted provided that the following conditions
10 .\" 1. Redistributions of source code must retain the above copyright
11 .\" notice, this list of conditions and the following disclaimer.
12 .\" 2. Redistributions in binary form must reproduce the above copyright
13 .\" notice, this list of conditions and the following disclaimer in
14 .\" the documentation and/or other materials provided with the
16 .\" 3. Neither the name of The DragonFly Project nor the names of its
17 .\" contributors may be used to endorse or promote products derived
18 .\" from this software without specific, prior written permission.
20 .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22 .\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
23 .\" FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
24 .\" COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
25 .\" INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
26 .\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
27 .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
28 .\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
29 .\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
30 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 .\" $DragonFly: src/share/man/man7/committer.7,v 1.11 2008/05/02 02:05:06 swildner Exp $
40 .Nd rules for DragonFly committers
41 .Sh GIT REPOSITORY ON YOUR LOCAL MACHINE
44 how to obtain a fresh copy of the
46 git repository on your machine.
47 Note that all developers have to pull/push through
51 should contain at least:
52 .Bd -literal -offset indent
55 email = <login>@dragonflybsd.org
58 Alternatively, see the
65 The git repository machine is
66 .Pa crater.dragonflybsd.org ,
70 .Pa leaf.dragonflybsd.org .
72 an account for you on both machines and install your public SSH
73 key to give you access.
77 account is set up for git repository only.
78 It can only operate as a git slave and cannot be logged into.
80 .Pa crater.dragonflybsd.org
81 is only used as part of
87 account is a general developer account.
92 account, whether a committer or not.
93 It can be useful as a developer rendezvous,
95 For example, people upload kernel cores to
98 developers can look at them.
102 .Bd -literal -offset indent
103 ssh you@leaf.dragonflybsd.org
106 The rules for account use are in
109 It is very important that you never install a password or create a SSH
112 to use to access other machines.
113 Because non-committers can have
117 is not considered a secure machine.
118 .Sh TESTING COMMIT ACCESS
119 There is a directory called
120 .Pa /usr/src/test/test .
122 access, try making a modification and committing a file in this
124 Try to push the commit to
127 .Bd -literal -offset indent
128 cd /usr/src/test/test
130 git commit file_you_edited
133 .Sh COMMITTING REAL WORK
134 Make modifications as needed.
135 For example, edit files.
136 If adding new files make git aware of them like this.
137 Files and directories can just be added locally.
138 These operations do not actually affect the master repository.
139 Instead they are stored in your local copy of the repository and then
140 synchronized to the repository when you
142 .Bd -literal -offset indent
147 To actually push your changes to the the repository on
150 .Bd -literal -offset indent
156 how to commit to a specific branch (to merge bug fixes, for example).
158 Do not set the default remote tag to
163 This reduces instances where accidental commits or repository
164 operations are made on the master repository.
165 .Sh STRUCTURE OF COMMIT MESSAGES
168 tools display the first line of a commit message as a summary,
169 structure your commit messages like this, if possible:
170 .Bd -literal -offset indent
171 One line summary of your change.
173 Maybe more text here describing your changes in detail (including
174 issue tracker id's etc).
176 .Sh DISCUSSING COMMITTABLE WORK BEFOREHAND
177 Discussion prior to committing usually occurs on the
182 mailing lists and depends on the work involved.
183 Simple and obvious work such as documentation edits or additions,
184 doesn't really need a heads up.
186 Simple and obvious bug fixes don't need a heads up either, other than to
187 say that you will (or just have) committed the fix, so you don't
188 race other committers trying to do the same thing.
189 Usually the developer most active in a discussion about a bug commits the
190 fix, but it isn't considered a big deal.
192 More complex issues are usually discussed on the lists first.
193 Non-trivial but straight forward bug fixes usually go through
194 a testing period, where you say something like:
197 to driver BLAH that fixes A, B, and C, please test it.
198 If there are no objections I will commit it next Tuesday.
201 or more depending on the complexity of the patch).
203 New drivers or utilities are usually discussed.
204 Committers will often commit new work
206 hooking it into the buildworld or
207 buildkernel infrastructure in order to be able to continue
208 development on it in piecemeal without having to worry about it
209 breaking buildworld or buildkernel, and then they hook it in as a
210 last step after they've stabilized it.
211 Examples of this include
212 new versions of GCC, updates to vendor packages such as bind,
215 Areas within the repository do not
218 Often situations will arise where one developer commits work and
219 another developer finds an issue with it that needs to be corrected.
221 All committed work becomes community property.
224 on any part of the source tree.
225 However, if a developer is
226 actively working on a portion of the source tree and you find a bug
227 or other issue, courtesy dictates that you post to
229 and/or email the developer.
231 This means that, generally, if you do not see a commit to an area
232 of the source tree in the last few weeks, it isn't considered active and
233 you don't really need to confer with the developer that made the
234 commit, though you should still post to the
236 mailing list and, of course, confer with developers when their expertise
239 One exception to this rule is documentation.
240 If any developer commits
241 new work, the documentation guys have free reign to go in and correct
244 This is really a convenience as most developers are not
246 gurus and it's a waste of time for the doc guys to post to
248 for all the little corrections they make.
250 On the occasion that a major code conflict occurs, for example if two
251 people are doing major work in the same area of the source tree and forgot
252 to collaborate with each other, the project leader will be responsible for
253 resolving the conflict.
254 Again, the repository is considered community
255 property and it must be acceptable for any developer to be able to work on
256 any area of the tree that he or she has an interest in.
257 .Sh MAJOR ARCHITECTURAL CHANGES
261 All major architectural changes must be discussed on the
263 mailing list and he retains veto power.
265 This isn't usually an issue with any work.
267 doesn't look right architecturally he'll chip in with adjustments to
269 Nothing ever really gets vetoed.
271 .Xr git 1 Pq Pa pkgsrc/devel/scmgit ,