Changes between Version 10 and Version 11 of GitRepo


Ignore:
Timestamp:
05/01/2013 06:00:03 PM (11 years ago)
Author:
Cas
Comment:

more detail about branches

Legend:

Unmodified
Added
Removed
Modified
  • GitRepo

    v10 v11  
    1 = Git Source Repository = 
     1= Git Source Code Repository = 
    22 
    3 Deluge's source code is always available through our [http://git.deluge-torrent.org/ Git repository]. 
     3Deluge's source code is always available through our [http://git.deluge-torrent.org/deluge Git repository]. 
    44 
    55To get a copy of the code, you will need to clone it from the repository then see the [wiki:'Installing/Source' Installation Guide]. 
    66 
    7 For more in depth-git usage see GitTips and GitCommit. 
     7For more in-depth git usage see GitTips and GitCommit. 
    88 
    9 If you are on Windows, you will need a [http://en.wikipedia.org/wiki/Git_%28software%29#Portability Git client]. This guide uses commands which are meant to be typed at a command prompt, but most of the same commands would be available from a graphical Git client or shell extension. If you wish to use the commands in this guide, you will need a command-line client such as [https://code.google.com/p/msysgit/downloads/list?can=3&q=official+Git Git for Windows] from the msysgit project. 
     9This guide uses commands which are meant to be typed at a command prompt, but most will be available from a GUI Git client. 
     10 
     11[http://git-scm.com/downloads Install Git] 
     12 
     13 
     14 
     15== Deluge Branches == 
     16There are multiple branches or tags that you can choose from which contain different stages of the Deluge code. 
     17 
     18Note that we are currently transitioning to a different [http://nvie.com/posts/a-successful-git-branching-model/ git workflow] with the development of ''1.4'' so picking the correct branch is crucial. 
     19 
     20The current branches (at time of writing) are: 
     21 
     22 '''`1.3-stable`'''::  
     23    This is the release branch for the 1.3-series and, until 1.4 release, is the recommended stable code. This branch is only for critical bug fixes and no new feature will appear in this branch.  
     24 '''`master`''':: 
     25    '''''This branch is in limbo until 1.4 release''''' This branch contains development code that is now continued in `develop`. When the `develop` code is considered stable, 1.4 will be released and the code will be merged back into `master` code. This mean going forward from 1.4 release this branch will be considered to be the most stable code, replacing the use of *-stable branches. 
     26 '''`develop`''':: 
     27    All development work will be put into this branch and should be considered unstable with risk of data loss and potential incompatibility with other Deluge versions. 
     28 '''`extjs4-port`''':: 
     29   A branch for porting the WebUI code from `Ext JS 3.4` to `Ext JS 4`, still requiring a lot of development work. 
    1030 
    1131== Initial Clone == 
     
    1939This will create a ''deluge'' directory with a copy of the repo so if you change into this directory you can start using git commands.  
    2040 
    21 == Selecting Branch == 
    2241 
    23 There are multiple branches or tags that you can choose from, but the main two are the current stable branch and the development branch.   
     42== Select Branch == 
    2443 
    2544List the branches, including remote branches: 
     
    2948}}} 
    3049 
    31 If you want to use a different branch than the default selected (''master'') then you will need to create a local copy of the remote branch. In this example we create branch '1.3-stable' as a local copy of the remote branch 'origin/1.3-stable' and switch to it: 
     50== Switch Branch == 
     51 
     52If you want to use a different branch than the default selected (`master`) then you will need to create a local copy of the remote branch. In this example we create branch '1.3-stable' as a local copy of the remote branch 'origin/1.3-stable' and switch to it: 
    3253 
    3354{{{ 
     
    3960 '''Development:''' 
    4061{{{ 
    41 git checkout master 
     62git checkout develop 
    4263}}} 
    4364 
     
    4768}}} 
    4869 
     70== Show current Branch == 
    4971Either of these commands will show the current branch you are using: 
    5072