Version Control on the CS Systems - Revision history

Phil: /* Non-CS Hosting */

2022-04-11T16:54:40Z

Non-CS Hosting

2022-04-11T16:37:01Z

2022-04-11T16:34:44Z

Update Mercurial link

2016-04-29T19:13:52Z

Using a VCS with Other People (Hosting Your Code For Public Access): Clarify that "website" is the person's CS-hosted website.

2016-03-03T18:01:42Z

Using a VCS Remotely: Ditto.

2016-03-03T17:59:52Z

Clarify that it's our Linux clients that have all of the described software.

2016-01-15T15:53:28Z

Using a VCS with Other People

2014-09-12T15:33:53Z

Using a VCS Yourself

2014-09-12T15:32:41Z

2014-09-12T15:31:36Z

@@ Line 210: / Line 210: @@
 [https://github.com GitHub] has [https://github.com/edu educational accounts] aimed at students working on class projects and at teachers providing repositories for their students.  These accounts support a limited number of private repositories, so your data is not explicitly shared with the world.  (It is, however, hosted on servers not under the direct control of Johns Hopkins.)
 [[Category:Linux Clients]]
 [[Category:Software]]

@@ Line 9: / Line 9: @@
 * [http://subversion.apache.org/ Subversion]
-If you're unfamiliar with version control, you are encouraged to read about each program to decide what's best for you.  Bazaar and Mercurial tend to be fairly newcomer-friendly.  git is currently very popular among many open source software projects.
+If you're unfamiliar with version control, you are encouraged to read about each program to decide what's best for you.  Git is probably a good default choice; it's what the vast majority of open source software projects use.
 == Using a VCS Yourself ==

@@ Line 6: / Line 6: @@
 * [http://darcs.net Darcs]
 * [http://git-scm.com/ Git]
-* [http://mercurial.selenic.com/ Mercurial]
+* [https://www.mercurial-scm.org/ Mercurial]
 * [http://subversion.apache.org/ Subversion]

@@ Line 66: / Line 66: @@
 == Using a VCS with Other People (Hosting Your Code For Public Access)==
-The CS department does not currently provide a centralized repository service for use by faculty and students, although that might change in the future.  Fortunately, it's not too hard to use your home directory and your [[:Category:Webpages_and_Webservices|website]] to facilitate collaboration with others, especially if you're using a distributed version control system.
+The CS department does not currently provide a centralized repository service for use by faculty and students, although that might change in the future.  Fortunately, it's not too hard to use your home directory and your [[:Category:Webpages_and_Webservices|CS website]] to facilitate collaboration with others, especially if you're using a distributed version control system.
 The essence of this approach is that you have a repository that's shared with others through your website.  They pull from your repository and make changes locally on their systems.  When those changes are ready to be integrated into your repository, either you pull from other people's web-shared repositories or they send you changesets that your version control system can integrate.

@@ Line 47: / Line 47: @@
 == Using a VCS Remotely ==
-You can keep a checkout of your files on other computers (like your personal desktop or laptop) and still commit changes to the repository you set up on the CS systems.  Although remote access will work through any of the [[:Category:Linux Clients|lab systems,]] we suggest that you use ''gradx'' on the Grad/Research network and ''ugradx'' on the Undergrad network.
+You can keep a checkout of your files on other computers (like your personal desktop or laptop) and still commit changes to the repository you set up on the CS systems.  Although remote access will work through any of the [[:Category:Linux Clients|Linux clients]], we suggest that you use ''gradx'' on the Grad/Research network and ''ugradx'' on the Undergrad network.
 Assuming you're on the Grad/Research network, for a project in <tt>~/my-project</tt> with an account name of ''your-account'', here are the repository URLs you would use with each DVCS:

@@ Line 1: / Line 1: @@
 __TOC__
-All of the [[:Category:Computers_Available_on_the_CS_Network|CS computers]] have at least the following '''Version-Control System (VCS)''' software installed:
+All of the [[:Category:Computers_Available_on_the_CS_Network|CS Linux clients]] have at least the following '''Version-Control System (VCS)''' software installed:
 * [http://bazaar.canonical.com/ Bazaar]

@@ Line 64: / Line 64: @@
 For '''CVS''', you would use <tt>:extssh:''your-account''@gradx.cs.jhu.edu:/users/''your-account''/my-project</tt>, with the same caveats about home directories as mentioned for Subversion.  '''NOTE:'''  CVS at CS is currently only supported for '''personal''' repositories, not collaborative ones.
-== Using a VCS with Other People ==
+== Using a VCS with Other People (Hosting Your Code For Public Access)==
 The CS department does not currently provide a centralized repository service for use by faculty and students, although that might change in the future.  Fortunately, it's not too hard to use your home directory and your [[:Category:Webpages_and_Webservices|website]] to facilitate collaboration with others, especially if you're using a distributed version control system.

@@ Line 25: / Line 25: @@
 After that, you can work with your files and commit them to the repository as you like.
-CVS and Subversion are ''centralized version control systems'' and, as such, need to have a separate repository, even if only one person will be working on it.  You will need to designate a subdirectory of your home directory as your Subversion or CVS repository in addition to the directory where you will be working with your files.
+CVS and Subversion are ''centralized version control'' systems and, as such, need to have a separate repository, even if only one person will be working on it.  You will need to designate a subdirectory of your home directory as your Subversion or CVS repository in addition to the directory where you will be working with your files.
 For Subversion, that looks something like this: