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

Update the repocopy section to indicate that portmgr may do the repocopy

Browse source 
directly instead of assigning it to pcvs.

Reminded by:	ru
This commit is contained in:
Joe Marcus Clarke 2004-09-13 02:41:24 +00:00
parent 7a72c7a16d
commit b389749180
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=22328
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -727,11 +727,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.211 2004-09-09 11:42:07 josef Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.212 2004-09-13 02:41:24 marcus 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.211 2004-09-09 11:42:07 josef Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.212 2004-09-13 02:41:24 marcus Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.211 2004-09-09 11:42:07 josef Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.212 2004-09-13 02:41:24 marcus Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -2450,7 +2450,9 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
reasons for the repository copy request. Assign it to reasons for the repository copy request. Assign it to
<literal>portmgr</literal> and set <varname>state</varname> to <literal>portmgr</literal> and set <varname>state</varname> to
<literal>repocopy</literal>. If &a.portmgr; approves it, <literal>repocopy</literal>. If &a.portmgr; approves it,
it will be reassigned to <literal>cvs</literal>. &a.cvsadm; will 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 do a repository copy from the old to the new location, and
reassign the PR back to you. Once everything is done, perform the reassign the PR back to you. Once everything is done, perform the
following:</para> following:</para>