Add the explanation of repocopy from the FAQ. While here, add entries
for P4, MFP4, PR.
This commit is contained in:
parent
d5bc1911ab
commit
df242b2384
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=26718
1 changed files with 64 additions and 1 deletions
|
@ -896,6 +896,11 @@
|
|||
<glosssee otherterm="mfc-glossary">
|
||||
</glossentry>
|
||||
|
||||
<glossentry>
|
||||
<glossterm>MFP4</glossterm>
|
||||
<glosssee otherterm="mfp4-glossary">
|
||||
</glossentry>
|
||||
|
||||
<glossentry>
|
||||
<glossterm>MFS</glossterm>
|
||||
<glosssee otherterm="mfs-glossary">
|
||||
|
@ -967,6 +972,16 @@
|
|||
</glossdef>
|
||||
</glossentry>
|
||||
|
||||
<glossentry id="mfp4-glossary">
|
||||
<glossterm>Merge From Perforce</glossterm>
|
||||
<acronym>MFP4</acronym>
|
||||
<glossdef subject="FreeBSD">
|
||||
<para>To merge functionality or a patch from the Perforce
|
||||
repository to the -CURRENT branch.</para>
|
||||
<glossseealso otherterm="perforce-glossary">
|
||||
</glossdef>
|
||||
</glossentry>
|
||||
|
||||
<glossentry id="mfs-glossary">
|
||||
<glossterm>Merge From Stable</glossterm>
|
||||
<acronym>MFS</acronym>
|
||||
|
@ -1121,6 +1136,11 @@
|
|||
<glossdiv>
|
||||
<title>P</title>
|
||||
|
||||
<glossentry>
|
||||
<glossterm>p4</glossterm>
|
||||
<glosssee otherterm="perforce-glossary">
|
||||
</glossentry>
|
||||
|
||||
<glossentry>
|
||||
<glossterm>PAE</glossterm>
|
||||
<glosssee otherterm="pae-glossary">
|
||||
|
@ -1225,6 +1245,20 @@
|
|||
</glossdef>
|
||||
</glossentry>
|
||||
|
||||
<glossentry id="perforce-glossary">
|
||||
<glossterm>Perforce</glossterm>
|
||||
<glossdef>
|
||||
<para>A source code control product made by
|
||||
<ulink url="http://www.perforce.com/">Perforce Software</ulink>
|
||||
which is more advanced than CVS. Although not open source, it use
|
||||
is free of charge to open-source projects such as &os;.</para>
|
||||
|
||||
<para>Some &os; developers use a Perforce repository as a staging
|
||||
area for code that is considered too experimental for the
|
||||
-CURRENT branch.</para>
|
||||
</glossdef>
|
||||
</glossentry>
|
||||
|
||||
<glossentry id="pc-glossary">
|
||||
<glossterm>Personal Computer</glossterm>
|
||||
<acronym>PC</acronym>
|
||||
|
@ -1338,7 +1372,10 @@
|
|||
<glossterm>Problem Report</glossterm>
|
||||
<acronym>PR</acronym>
|
||||
<glossdef>
|
||||
<para></para>
|
||||
<para>A description of some kind of problem that has been
|
||||
found in either the &os; source or documentation. See
|
||||
<ulink url="&url.articles.problem-reports/index.html">
|
||||
Writing &os; Problem Reports</ulink>.</para>
|
||||
</glossdef>
|
||||
</glossentry>
|
||||
|
||||
|
@ -1463,6 +1500,32 @@
|
|||
</glossdef>
|
||||
</glossentry>
|
||||
|
||||
<glossentry>
|
||||
<glossterm>repocopy</glossterm>
|
||||
<glosssee otherterm="repocopy-glossary">
|
||||
</glossentry>
|
||||
|
||||
<glossentry id="repocopy-glossary">
|
||||
<glossterm>Repository Copy</glossterm>
|
||||
<glossdef>
|
||||
<para>A direct copying of files within the CVS repository.</para>
|
||||
|
||||
<para>Without a repocopy, if a file needed to be copied or
|
||||
moved to another place in the repository, the committer would
|
||||
run <command>cvs add</command> to put the file in its new
|
||||
location, and then <command>cvs rm</command> on the old file
|
||||
if the old copy was being removed.</para>
|
||||
|
||||
<para>The disadvantage of this method is that the history
|
||||
(i.e. the entries in the CVS logs) of the file would not be
|
||||
copied to the new location. As the &os; Project considers
|
||||
this history very useful, a repository copy is often used
|
||||
instead. This is a process where one of the repository meisters
|
||||
will copy the files directly within the repository, rather than
|
||||
using the &man.cvs.1; program.</para>
|
||||
</glossdef>
|
||||
</glossentry>
|
||||
|
||||
<glossentry id="rfc-glossary">
|
||||
<glossterm>Request For Comments</glossterm>
|
||||
<acronym>RFC</acronym>
|
||||
|
|
Loading…
Reference in a new issue