Make a start at bringing the p4-primer up-to-date: Explain how Perforce

and Subversion interact.

More work is still needed before this fully reflects current reality.

Approved by:	bcr (mentor)
This commit is contained in:
Gavin Atkinson 2013-03-07 23:37:00 +00:00
parent d548477740
commit 5fd3d3f68e
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=41130

View file

@ -37,7 +37,7 @@
<para>The &os; project uses the <application>Perforce</application>
version control system to manage experimental projects that are
not ready for the main CVS repository.</para>
not ready for the main Subversion repository.</para>
<sect2 id="resources">
<title>Availability, Documentation, and Resources</title>
@ -68,9 +68,9 @@
<para>The &os; <application>Perforce</application> server is
hosted on <hostid role="fqdn">perforce.freebsd.org</hostid>,
port <literal>1666</literal>. The repository is browsable
online at <ulink url="http://perforce.freebsd.org"></ulink>.
online at <ulink url="http://p4web.freebsd.org"></ulink>.
Some portions of the repository are also automatically exported
to a number of <application>CVSup</application> servers.</para>
to a number of legacy <application>CVSup</application> servers.</para>
</sect2>
</sect1>
@ -334,7 +334,8 @@
with &os;. Frequent submits of changes to the server are also
encouraged.</para>
<para>The <application>Perforce</application> repository (the
<para>sSimilar to <application>Subversion</application>, the
<application>Perforce</application> repository (the
<quote>depot</quote>) is a single flat tree. Every file, whether
a unique creation or a derivative from a branch, is accessible via
a simple path under the server <filename
@ -806,12 +807,12 @@
</sect1>
<sect1 id="freebsd-cvs-and-p4">
<title>Interactions between &os; CVS and Perforce</title>
<title>Interactions between &os; Subversion and Perforce</title>
<para>The &os; <application>Perforce</application> and CVS
repositories are completely separate. However, changes to CVS are
<para>The &os; <application>Perforce</application> and <application>Subversion</application>
repositories are completely separate. However, changes to Subversion are
tracked at near-real-time in <application>Perforce</application>.
Every 2 minutes, the CVS server is polled for updates in the HEAD
Every 2 minutes, the Subversion server is polled for updates in the HEAD
branch, and those updates are committed to
<application>Perforce</application> in the <filename
class="directory">//depot/vendor/freebsd/...</filename> tree. This
@ -822,10 +823,10 @@
should be done so that your tree stays up to date and avoids
conflicts with mainline development.</para>
<para>The bridge between CVS and <application>Perforce</application>
is one-way; changes to CVS will be reflected in
<para>The bridge between Subversion and <application>Perforce</application>
is one-way; changes to Subversion will be reflected in
<application>Perforce</application>, but changes in Perforce will
not be reflected in CVS. On request, some parts of the
not be reflected in Subversion. On request, some parts of the
<application>Perforce</application> repo can be exported to
<application>CVSup</application> and made available for
distribution that way. Contact the &os;