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

When removing or repo-copying ports, it's now also required to

Browse source 
add an entry to the MOVED file.

Inspired by:	kris (implicitely)
This commit is contained in:
Alexander Langer 2003-07-23 13:11:14 +00:00
parent d9040dbaa5
commit 057a60e02a
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=17653
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -665,11 +665,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.freebsd.o
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.171 2003-07-13 16:15:52 ceri Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.172 2003-07-23 13:11:14 alex 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.171 2003-07-13 16:15:52 ceri Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.171 2003-07-13 16:15:52 ceri Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.172 2003-07-23 13:11:14 alex Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.172 2003-07-23 13:11:14 alex Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2343,6 +2343,11 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<step>
<para>Add the new module entry.</para>
</step>
<step>
<para>Add an entry to
<filename>ports/MOVED</filename>.</para>
</step>
</procedure>
</listitem>
@ -2365,6 +2370,11 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<makevar>SUBDIR</makevar> entry and the old module
entry.</para>
</step>
<step>
<para>Add an entry to
<filename>ports/MOVED</filename>.</para>
</step>
</procedure>
</listitem>