Changes between Version 4 and Version 5 of pushing_changes_to_red


Ignore:
Timestamp:
Dec 15, 2010, 4:05:35 PM (9 years ago)
Author:
Daniel Kahn Gillmor
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • pushing_changes_to_red

    v4 v5  
    1 = What is Red =
     1[[PageOutline]]
     2== What is Red ==
    23
    3 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.
     4Red 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.
     5
     6It provides the code behind https://members.mayfirst.org/cp , and many of the other systems that hook into it.
    47
    58== The Red Repository ==
    69
    7 The svn repository for red is at
     10The canonical location for red's source code is [source:trunk/red an SVN repository], accessible at `mfpl@svn.mayfirst.org/trunk/red`
    811
    9 {{{
    10 mfpl@svn.mayfirst.org/trunk/red
    11 }}}
    12 === Using git-svn ===
     12=== Using `git-svn` ===
    1313
    14  * Clone the repository with the following command.
     14If you prefer to use `git` for local revision control tracking, you can still talk to the SVN repo using `git-svn`
    1515
     16 * Clone the svn repository to a `git-svn` branch:
    1617{{{
    1718git svn clone svn+ssh://mfpl@svn.mayfirst.org/trunk/red
    1819}}}
    19 
    20  * Update the repository with.
    21 
     20 * Update your local git repo's view of the svn repository:
    2221{{{
    2322git svn fetch
    2423}}}
    25 
    26  * Merge changes with
    27 
     24 * If you have made edits, and the canonical svn repository has changed in the meantime, merge your edits with the current SVN head:
    2825{{{
    2926git svn rebase
    3027}}}
    31 
    32  * Committing Changes
    33   * In order to commit changes using git-svn first do a standard git commit method.
    34   * Next commit changes to the svn repository by using:
    35 
     28 * Committing Changes: In order to commit changes using `git-svn`:
     29  1. start with a standard:
     30{{{
     31git commit
     32}}}
     33  1. push your changes to the canonical svn repository:
    3634{{{
    3735git svn dcommit
     
    5048}}}
    5149
    52 ==== Updating Red ====
     50==== Updating the live Control Panel ====
    5351
    5452After tagging the committed changes cd into the mfpl-servers repository to mfpl-servers/admin/scripts and issue the following command: