Try not to give the impression 'cvs import' should be used for ports.
Reviewed by: jhb
This commit is contained in:
Ben Smithurst
parent
15a19c4ae5
commit
905911ab27
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=9087
2 changed files with 24 additions and 24 deletions
|
|
@ -19,7 +19,7 @@
|
|||
</author>
|
||||
</authorgroup>
|
||||
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.49 2001/01/25 00:09:15 brian Exp $</pubdate>
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.50 2001/03/28 10:55:43 phk Exp $</pubdate>
|
||||
|
||||
<copyright>
|
||||
<year>1999</year>
|
||||
|
|
@ -516,11 +516,11 @@
|
|||
</itemizedlist>
|
||||
|
||||
<para>You'll almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $</literal> (or in FreeBSD's case,
|
||||
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
|
||||
the file to resolve the conflict (remove the marker lines and
|
||||
the second <literal>$Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
|
@ -1625,20 +1625,20 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
|
||||
<qandaset>
|
||||
<qandadiv>
|
||||
<title>Importing a New Port</title>
|
||||
<title>Adding a New Port</title>
|
||||
|
||||
<qandaentry>
|
||||
<question>
|
||||
<para>How do I import a new port?</para>
|
||||
<para>How do I add a new port?</para>
|
||||
</question>
|
||||
|
||||
<answer>
|
||||
<para>First, please read the section about repository
|
||||
copy.</para>
|
||||
|
||||
<para>The easiest way to import a new port is to use the
|
||||
<para>The easiest way to add a new port is to use the
|
||||
<command>addport</command> script on
|
||||
<hostid>freefall</hostid>. It will import a port from the
|
||||
<hostid>freefall</hostid>. It will add a port from the
|
||||
directory you specify, determining the category automatically
|
||||
from the port <filename>Makefile</filename>.
|
||||
It will also add an entry to the
|
||||
|
|
@ -1652,7 +1652,7 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
|
||||
<qandaentry>
|
||||
<question>
|
||||
<para>Any other things I need to know when I import a new
|
||||
<para>Any other things I need to know when I add a new
|
||||
port?</para>
|
||||
</question>
|
||||
|
||||
|
|
@ -1705,7 +1705,7 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
</question>
|
||||
|
||||
<answer>
|
||||
<para>When you want to import a port that is related to
|
||||
<para>When you want to add a port that is related to
|
||||
any port that is already in the tree in a separate
|
||||
directory, please send mail to the ports manager asking
|
||||
about it. Here <wordasword>related</wordasword> means
|
||||
|
|
@ -1731,9 +1731,9 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
|
||||
<answer>
|
||||
<para>When there is no history to preserve. If a port is
|
||||
imported into a wrong category and is moved immediately,
|
||||
added into a wrong category and is moved immediately,
|
||||
it suffices to simply <command>cvs remove</command> the
|
||||
old one and <command>cvs import</command> the new
|
||||
old one and <command>addport</command> the new
|
||||
one.</para>
|
||||
</answer>
|
||||
</qandaentry>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
</author>
|
||||
</authorgroup>
|
||||
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.49 2001/01/25 00:09:15 brian Exp $</pubdate>
|
||||
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.50 2001/03/28 10:55:43 phk Exp $</pubdate>
|
||||
|
||||
<copyright>
|
||||
<year>1999</year>
|
||||
|
|
@ -516,11 +516,11 @@
|
|||
</itemizedlist>
|
||||
|
||||
<para>You'll almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $</literal> (or in FreeBSD's case,
|
||||
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
|
||||
the file to resolve the conflict (remove the marker lines and
|
||||
the second <literal>$Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.50 2001-03-28 10:55:43 phk Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.51 2001-03-28 23:43:47 ben Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
|
@ -1625,20 +1625,20 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
|
||||
<qandaset>
|
||||
<qandadiv>
|
||||
<title>Importing a New Port</title>
|
||||
<title>Adding a New Port</title>
|
||||
|
||||
<qandaentry>
|
||||
<question>
|
||||
<para>How do I import a new port?</para>
|
||||
<para>How do I add a new port?</para>
|
||||
</question>
|
||||
|
||||
<answer>
|
||||
<para>First, please read the section about repository
|
||||
copy.</para>
|
||||
|
||||
<para>The easiest way to import a new port is to use the
|
||||
<para>The easiest way to add a new port is to use the
|
||||
<command>addport</command> script on
|
||||
<hostid>freefall</hostid>. It will import a port from the
|
||||
<hostid>freefall</hostid>. It will add a port from the
|
||||
directory you specify, determining the category automatically
|
||||
from the port <filename>Makefile</filename>.
|
||||
It will also add an entry to the
|
||||
|
|
@ -1652,7 +1652,7 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
|
||||
<qandaentry>
|
||||
<question>
|
||||
<para>Any other things I need to know when I import a new
|
||||
<para>Any other things I need to know when I add a new
|
||||
port?</para>
|
||||
</question>
|
||||
|
||||
|
|
@ -1705,7 +1705,7 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
</question>
|
||||
|
||||
<answer>
|
||||
<para>When you want to import a port that is related to
|
||||
<para>When you want to add a port that is related to
|
||||
any port that is already in the tree in a separate
|
||||
directory, please send mail to the ports manager asking
|
||||
about it. Here <wordasword>related</wordasword> means
|
||||
|
|
@ -1731,9 +1731,9 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
|
||||
<answer>
|
||||
<para>When there is no history to preserve. If a port is
|
||||
imported into a wrong category and is moved immediately,
|
||||
added into a wrong category and is moved immediately,
|
||||
it suffices to simply <command>cvs remove</command> the
|
||||
old one and <command>cvs import</command> the new
|
||||
old one and <command>addport</command> the new
|
||||
one.</para>
|
||||
</answer>
|
||||
</qandaentry>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue