The major advantage of Anonymous CVS over other source code update techniques is that it works directly against a central source code repository or mirror. This means that you have the full set of CVS commands available to control merging and updating your changes with -other source changes and for performing diffs, change histories -and other queries against the central repository. +other source changes, performing diffs, change histories and other +queries against the central repository.
-The OpenBSD Project currently has four active and two historic -source repositories: +The OpenBSD Project currently has four active source repositories:
To summarize, the real strength of using Anonymous CVS is that it is -a "tolerant" source code control system - it respects -changes that you have made to your local sources and makes -"best efforts" to update your entire source tree, rather than +a "tolerant" source code control system - it respects +changes that you have made to your local sources and makes +"best efforts" to update your entire source tree, rather than leaving you a list of arcane problems that have to be resolved before continuing. +
+In the event that the changes can't be completely merged, CVS provides a +"soft fallback", providing you with annotated changes to your +local copy, preserving an unmodified copy of your version and continuing +to update any other source modules you requested. +
-The major strength of CVS is that it has the ability to perform intelligent -merges of changes to the central repository with changes that you make to -your local copy. This means that if you make a change to a module and -perform an update, your changes are not "blown away", rather CVS makes -best efforts to merge the changes made to the central sources with changes -you've made to your local copy. - -
-In the event that the changes can't be completely merged, CVS provides a -"soft fallback", providing you with annotated changes to your -local copy, preserving an unmodified copy of your version and continuing -to update any other source modules you requested. - -
- # cd /usr/src - # tar xzf ../sys.tar.gz - # tar xzf ../src.tar.gz - # cd /usr - # tar xzf xenocara.tar.gz - # tar xzf ports.tar.gz -+
-+# cd /usr/src +# tar xzf /tmp/src.tar.gz +# tar xzf /tmp/sys.tar.gz +# cd /usr +# tar xzf /tmp/xenocara.tar.gz +# tar xzf /tmp/ports.tar.gz +
Not all people will wish to unpack all the file sets, but as the system must be kept in sync, you will generally need to set up all trees. @@ -144,10 +126,9 @@ After this, /usr/src will be a nice checkout area where all cvs(1) commands will work properly. -
CVS was designed to be a simple way to retrieve and update your sources. You must first decide whether you want to track -current or a patch branch. @@ -157,31 +138,33 @@ For more information on these "flavors" of OpenBSD, see here. -
Once you have decided which tree to follow, you must choose which Anonymous +
+Once you have decided which tree to follow, you must choose which Anonymous CVS server you are going to use. A list of these servers is below.
-Once you have chosen which Anonymous CVS Server you will -use, you can start using cvs. For those of you -who have CDs you can start with the CVS checkout that is on the CD by using -the method above to get the sources onto your system. -If you don't have a CD handy, use the method below to checkout the sources. +Once you have chosen which server you will use, you can start using cvs. +If you begin with src.tar.gz and sys.tar.gz as mentioned +above, you can skip the initial get and proceed to updating. +
-
(If you are following current): -
- # cd /usr - # cvs -qd anoncvs@anoncvs.ca.openbsd.org:/cvs get -P src -+
-+$ cd /usr +$ cvs -qd anoncvs@anoncvs.ca.openbsd.org:/cvs get -P src +
(If you are following the patch branch for 6.0): -
- # cd /usr - # cvs -qd anoncvs@anoncvs.ca.openbsd.org:/cvs get -rOPENBSD_6_0 -P src -+(If you are following the patch branch for 6.0): + +
Anonymous CVS uses passwordless SSH as a transport. @@ -189,99 +172,115 @@ you will be asked to confirm the SSH fingerprint to ensure that you are connecting to the expected server: -+$ cd /usr +$ cvs -qd anoncvs@anoncvs.ca.openbsd.org:/cvs get -rOPENBSD_6_0 -P src +
- $ cvs -d anoncvs@anoncvs.spacehopper.org:/cvs get src - The authenticity of host 'anoncvs.spacehopper.org (2001:67c:15f4:a423::28)' can't be established. - ED25519 key fingerprint is SHA256:oaJ7VEyjt2EHMeixzKn9zJGiV5YlWHIUls070tKdBzI. - Are you sure you want to continue connecting (yes/no)? -+
In most cases, the list below includes the fingerprints for the server, so you can compare it against the displayed fingerprint as additional verification that you are connecting to the correct server. Confirm this, and the fingerprint will then be saved as usual. -+$ cvs -d anoncvs@anoncvs.spacehopper.org:/cvs get -P src +The authenticity of host 'anoncvs.spacehopper.org (2001:67c:15f4:a423::28)' can't be established. +ED25519 key fingerprint is SHA256:oaJ7VEyjt2EHMeixzKn9zJGiV5YlWHIUls070tKdBzI. +Are you sure you want to continue connecting (yes/no)? +
- Are you sure you want to continue connecting (yes/no)? yes - Warning: Permanently added 'anoncvs.spacehopper.org' (ED25519) to the list of known hosts. - ... -+
-+Are you sure you want to continue connecting (yes/no)? yes +Warning: Permanently added 'anoncvs.spacehopper.org' (ED25519) to the list of known hosts. +
(If you are following current): -
- # cd /usr/src - # cvs -q up -Pd -+
(If you are following the patch branch for 6.0): -
- # cd /usr/src - # cvs -q up -rOPENBSD_6_0 -Pd -+
+(If you are following current): -Every time you ran this it would synchronize your /usr/src tree. -It would not destroy any of your local changes, rather it would attempt +
+ +(If you are following the patch branch for 6.0): + ++$ cd /usr/src +$ cvs -q up -Pd +
+ +Every time you ran this, it would synchronize your /usr/src tree. +It would not destroy any of your local changes; rather it would attempt to merge changes in.+$ cd /usr/src +$ cvs -q up -rOPENBSD_6_0 -Pd +
- # cd /usr/src - # cvs -d anoncvs@anoncvs.ca.openbsd.org:/cvs -q up -Pd -+ +
+$ cd /usr/src +$ cvs -d anoncvs@anoncvs.ca.openbsd.org:/cvs -q up -Pd +
-To use ports, +To use ports, it is similar to src: +
(If you are following current): -
- # cd /usr - # cvs -qd anoncvs@anoncvs.ca.openbsd.org:/cvs get -P ports --
(If you are following the patch branch for 6.0): -
- # cd /usr - # cvs -qd anoncvs@anoncvs.ca.openbsd.org:/cvs get -rOPENBSD_6_0 -P ports --
(If you are following current): -
- # cd /usr/ports - # cvs -q up -Pd --
(If you are following the patch branch for 6.0): -
- # cd /usr/ports - # cvs -q up -rOPENBSD_6_0 -Pd -+ +
+(If you are following current): + +
+ +(If you are following the patch branch for 6.0): + ++$ cd /usr +$ cvs -qd anoncvs@anoncvs.ca.openbsd.org:/cvs get -P ports +
+ ++$ cd /usr +$ cvs -qd anoncvs@anoncvs.ca.openbsd.org:/cvs get -rOPENBSD_6_0 -P ports +
+(If you are following current): + +
+ +(If you are following the patch branch for 6.0): + ++$ cd /usr/ports +$ cvs -q up -Pd +
++$ cd /usr/ports +$ cvs -q up -rOPENBSD_6_0 -Pd +
To make a diff of a locally patched module (here cd.c) to include with a bug report: -
- # cd /usr - # cvs diff -u src/sys/scsi/cd.c > /tmp/patch --
-The cvs(1) man page +
+ +The cvs(1) man page (included with the CVS sources) has much more information about how CVS can be used.+$ cd /usr +$ cvs diff -u src/sys/scsi/cd.c > /tmp/patch +
-Warning: -When using cvs you should take care that your current directory is either +Warning: +When using cvs, you should take care that your current directory is either the root of the tree you are referencing or in a separate place such as /tmp. Some commands such as "get" can create an arbitrary sub-tree in the current directory, and a subsequent update will recursively flesh out this sub-tree. @@ -292,28 +291,27 @@ before getting "commit" access -- as a result of showing useful skills and high quality results they will naturally later be given developer access. -As well, people providing patches can create their "diff"s relative +As well, people providing patches can create their diffs relative to the CVS tree, which will ease integration.
A sample use of an anoncvs server would be: -
-$ cd /tmp -$ cvs -d anoncvs@anoncvs.ca.openbsd.org:/cvs get src/sys/arch/sparc - [copies the files from the repository to your machine] -$ cd src/sys/arch/sparc -$ cvs log locore.s - [shows the commit log for the chosen file] -$ cvs diff -bc -r1.1 -r1.5 locore.s - [shows the changes between revisions 1.1 and rev 1.5] -+
++$ cd /tmp +$ cvs -d anoncvs@anoncvs.ca.openbsd.org:/cvs get -P src/sys/arch/sparc +[copies the files from the repository to your machine] +$ cd src/sys/arch/sparc +$ cvs log locore.s +[shows the commit log for the chosen file] +$ cvs diff -bc -r1.1 -r1.5 locore.s +[shows the changes between revisions 1.1 and rev 1.5] +
Host anoncvs.ca.openbsd.org
Port 2022
@@ -621,7 +619,7 @@
Final notes
After upgrading your source tree, you should read the comments
at the top of /usr/src/Makefile before attempting
-a build. Also, you should build a new kernel before
+a build. Also, you should build a new kernel before
doing a make build if possible. In some cases it may be
necessary to rebuild and install the config utility before
you can build the kernel. If config GENERIC fails this