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

- Document a policy to force commit to copied port after repocopy

Browse source
This commit is contained in:
Pav Lucistnik 2007-06-18 09:34:27 +00:00
parent 12e66265d3
commit 9c2e90bea8
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=30303
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -731,11 +731,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
</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.261 2007-04-25 13:13:22 roam Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.262 2007-06-18 09:34:27 pav 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.261 2007-04-25 13:13:22 roam Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.262 2007-06-18 09:34:27 pav Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.261 2007-04-25 13:13:22 roam Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.262 2007-06-18 09:34:27 pav Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -2546,6 +2546,11 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<para>When a port has been repo copied:</para> <para>When a port has been repo copied:</para>
<procedure> <procedure>
<step>
<para>Do a force commit on the files of the copied port,
stating repository copy was performed.</para>
</step>
<step> <step>
<para>Upgrade the copied port to the new version. <para>Upgrade the copied port to the new version.
Remember to change the <makevar>LATEST_LINK</makevar> Remember to change the <makevar>LATEST_LINK</makevar>