=================================================================== RCS file: /cvsrepo/anoncvs/cvs/www/anoncvs.html,v retrieving revision 1.458 retrieving revision 1.459 diff -u -r1.458 -r1.459 --- www/anoncvs.html 2016/09/03 01:13:50 1.458 +++ www/anoncvs.html 2016/09/03 02:59:48 1.459 @@ -11,6 +11,9 @@ +
@@ -30,12 +33,12 @@ of a release.-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, performing diffs, change histories and other -queries against the central repository. +Anonymous CVS works directly against a central source code repository. +This means that you have the full set of CVS commands available to control +merging and updating your changes with other source changes, performing diffs, +change histories and other queries against the central repository. +In the event that the changes can't be completely merged, CVS provides annotated +changes to your local copy and preserves an unmodified copy of your version.
The OpenBSD Project currently has four active source repositories: @@ -47,21 +50,8 @@
-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. - -
-To extract the source tree from the CD to /usr/src (assuming the CD is -mounted on /mnt): +The source files for download from the mirrors are +separated into two files to reduce the time required to download for those +wishing to work with only one part of the tree. +The kernel sources are in sys.tar.gz and the userland sources +are in src.tar.gz.
- -The source files for download from the FTP servers are separated into two -files to minimize the time required to download for those wishing to work -with only one part of the tree. The two files are sys.tar.gz, -which contains the files used to create the kernel, and src.tar.gz -which contains all the other "userland" utilities. -In general, however, you will usually want both of them installed. -Assuming the downloaded files, src.tar.gz, -sys.tar.gz and xenocara.tar.gz are in /tmp: - -# cd /usr/src -# tar xzf /mnt/src.tar.gz -# cd /usr -# tar xzf /mnt/xenocara.tar.gz -# tar xzf /mnt/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. +-# cd /usr/src # tar xzf /tmp/src.tar.gz # tar xzf /tmp/sys.tar.gz # cd /usr @@ -116,36 +89,20 @@ # tar xzf /tmp/ports.tar.gz
-You can also just use cvs(1) to "checkout" the source repository -for you. This is discussed in the next section. - -
-After this, /usr/src will be a nice checkout area where all -cvs(1) commands will work properly. - -
-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 server you will use, you can start using cvs. +Choose the Anonymous CVS server you are going to use from the +list of servers below, then 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. @@ -153,14 +110,14 @@
-(If you are following current): +If you are following current:
-(If you are following the patch branch for 6.0): +If you are following the patch branch for 6.0:$ cd /usr $ cvs -qd anoncvs@anoncvs.ca.openbsd.org:/cvs get -P src
-$ cd /usr @@ -190,17 +147,17 @@ Warning: Permanently added 'anoncvs.spacehopper.org' (ED25519) to the list of known hosts.
-(If you are following current): +If you are following current:
-(If you are following the patch branch for 6.0): +If you are following the patch branch for 6.0:$ cd /usr/src $ cvs -q up -Pd
$ cd /usr/src @@ -229,14 +186,14 @@
-(If you are following current): +If you are following current:
-(If you are following the patch branch for 6.0): +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 @@ -246,14 +203,14 @@- Any time afterwards, to update this tree:
-(If you are following current): +If you are following current:
-(If you are following the patch branch for 6.0): +If you are following the patch branch for 6.0:$ cd /usr/ports $ cvs -q up -Pd-$ cd /usr/ports @@ -295,7 +252,7 @@ As well, people providing patches can create their diffs relative to the CVS tree, which will ease integration. -Example usage for cvs(1)
+Example usage for cvs(1)
A sample use of an anoncvs server would be: @@ -310,8 +267,7 @@ [shows the changes between revisions 1.1 and rev 1.5]Available Anonymous CVS Servers -
+Available Anonymous CVS servers
- CVSROOT=anoncvs@anoncvs.au.openbsd.org:/cvs