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

- Change docs to match reality: marcus is doing ports repocopies directly,

Browse source 
no reassigning of PRs to pcvs is taking place
This commit is contained in:
Pav Lucistnik 2008-05-11 19:24:40 +00:00
parent 9b432018f7
commit c097455faa
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=31981
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -750,11 +750,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.273 2008-04-27 12:01:34 gabor Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.274 2008-05-11 19:24:40 pav Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
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.273 2008-04-27 12:01:34 gabor Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.273 2008-04-27 12:01:34 gabor Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.274 2008-05-11 19:24:40 pav Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.274 2008-05-11 19:24:40 pav Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2692,11 +2692,9 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<para>File a PR in <application>GNATS</application>, listing the
reasons for the repository copy request. Assign it to
<literal>portmgr</literal> and set <varname>state</varname> to
<literal>repocopy</literal>. If &a.portmgr; approves it,
it will be reassigned to <literal>pcvs</literal>.
If so inclined, <literal>portmgr</literal> may do
the copy directly; otherwise, &a.pcvs; will
do a repository copy from the old to the new location, and
<literal>repocopy</literal>. In a few days,
<literal>portmgr</literal> will do
a repository copy from the old to the new location, and
reassign the PR back to you. Once everything is done, perform the
following:</para>