os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rewrite the paragraph about mentorship to reflect current practices.

Browse source 
Also tweak a paragraph about committing to -CURRENT before -STABLE to note
that this only applies to src.
This commit is contained in:
Dag-Erling Smørgrav 2004-04-02 19:26:47 +00:00
parent bcdced5e83
commit 58b980fce6
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=20476
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -678,11 +678,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.freebsd.o
</itemizedlist> </itemizedlist>
<para>You will almost certainly get a conflict because <para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.181 2004-04-01 19:43:15 hrs Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.182 2004-04-02 19:26:47 des Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict lines, so you will have to edit the file to resolve the conflict
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.181 2004-04-01 19:43:15 hrs Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.182 2004-04-02 19:26:47 des Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.181 2004-04-01 19:43:15 hrs Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.182 2004-04-02 19:26:47 des Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1060,15 +1060,19 @@ checkout -P</programlisting>
</itemizedlist> </itemizedlist>
<para>All new committers also have a mentor assigned to them for <para>All new committers also have a mentor assigned to them for
the first few months. Your mentor is more or less responsible for the first few months. Your mentor is responsible for teaching
explaining anything which is confusing to you and is also you the rules and conventions of the project and guiding your
responsible for your actions during this initial period. If you first steps in the committer community. He or she is also
make a bogus commit, it is only going to embarrass your mentor personally responsible for your actions during this initial
and you should probably make it a policy to pass at least your period. Until your mentor decides (and announces with a forced
first few commits by your mentor before committing it to the commit to <filename>access</filename>) that you have learned the
repository.</para> ropes and are ready to commit on your own, you should not commit
anything without first getting your mentor's review and
approval, and you should document that approval with an
<literal>Approved by:</literal> line in the commit
message.</para>
<para>All commits should go to &os.current; first <para>All <filename>src</filename> commits should go to &os.current; first
before being merged to &os.stable;. No major new before being merged to &os.stable;. No major new
features or high-risk modifications should be made to the features or high-risk modifications should be made to the
&os.stable; branch.</para> &os.stable; branch.</para>