Changes between Version 4 and Version 5 of pushing_changes_to_red

Timestamp:

Dec 15, 2010, 9:05:35 PM (15 years ago)

Author:

Daniel Kahn Gillmor

Comment:

--

pushing_changes_to_red

@@ -1 @@
-= What is Red =
+[[PageOutline]]
+== What is Red ==
 
-Red is a server management web interface written by Jamie McClelland.  It allows privileged users the ability to modify many settings through a web UI, including apache server configurations, domain names, installing Drupal, email accounts, etc.  Red seeks to increase configuration flexibility while reducing the complexity of server management by creating an easy to use and follow interface. 
+Red is a server management web interface written by Jamie McClelland.  It allows privileged users the ability to modify many settings through a web UI, including apache server configurations, domain names, installing Drupal, email accounts, etc.  Red seeks to increase configuration flexibility while reducing the complexity of server management by creating an easy-to-use and -understand interface.
+
+It provides the code behind https://members.mayfirst.org/cp , and many of the other systems that hook into it.
 
 == The Red Repository ==
 
-The svn repository for red is at 
+The canonical location for red's source code is [source:trunk/red an SVN repository], accessible at `mfpl@svn.mayfirst.org/trunk/red` 
 
-{{{
-mfpl@svn.mayfirst.org/trunk/red
-}}}
-=== Using git-svn ===
+=== Using `git-svn` ===
 
- * Clone the repository with the following command.
+If you prefer to use `git` for local revision control tracking, you can still talk to the SVN repo using `git-svn`
 
+ * Clone the svn repository to a `git-svn` branch:
 {{{
 git svn clone svn+ssh://mfpl@svn.mayfirst.org/trunk/red
 }}}
-
- * Update the repository with.
-
+ * Update your local git repo's view of the svn repository:
 {{{
 git svn fetch
 }}}
-
- * Merge changes with
-
+ * If you have made edits, and the canonical svn repository has changed in the meantime, merge your edits with the current SVN head:
 {{{
 git svn rebase
 }}}
-
- * Committing Changes
-  * In order to commit changes using git-svn first do a standard git commit method.
-  * Next commit changes to the svn repository by using:
-
+ * Committing Changes: In order to commit changes using `git-svn`:
+  1. start with a standard:
+{{{
+git commit
+}}}
+  1. push your changes to the canonical svn repository:
 {{{
 git svn dcommit
@@ -50 +48 @@
 }}}
 
-==== Updating Red ====
+==== Updating the live Control Panel ====
 
 After tagging the committed changes cd into the mfpl-servers repository to mfpl-servers/admin/scripts and issue the following command: