Changes between Version 1 and Version 2 of ClusterGit/ExampleWorkflow


Ignore:
Timestamp:
05/22/11 04:42:56 (3 years ago)
Author:
digimer
Comment:

Fixed the last copy from the old wiki to work on the new Trac syntax.

Legend:

Unmodified
Added
Removed
Modified
  • ClusterGit/ExampleWorkflow

    v1 v2  
    1 ## Please edit system and help pages ONLY in the moinmaster wiki! For more 
    2 ## information, please see MoinMaster:MoinPagesEditorGroup. 
    3 ##acl MoinPagesEditorGroup:read,write,delete,revert All:read 
    4 ##master-page:HelpTemplate 
    5 ##master-date:Unknown-Date 
    6 #format wiki 
    7 #language en 
    8 == Example Git Workflow == 
     1= Example Git Workflow = 
    92 
    10 <<TableOfContents(4)>> 
     3 * [#what What's this?] 
     4 * [#workflow Workflow] 
     5   * [#remotes Setting up remotes] 
     6   * [#local_branch Creating local tracking branches] 
     7   * [#making_changes Making changes and committing them] 
     8   * [#cherry_picking Cherry-picking patches] 
     9   * [#pushing_changes Pushing changes] 
    1110 
    12 === What's this? === 
     11= What's this? = #what 
    1312This is an example of how you can manage your cluster git trees as "remotes" to keep them all in one place and to make it easy to cherry pick patches between them. At first it may seem slightly odd to those who have only seen git workflows based on "git clone" and separate directories for each remote tree, but it does have many advantages. 
    1413 
    15 === Workflow === 
     14= Workflow = #workflow 
    1615 
    1716This assumes that you're starting from scratch, so the first task is to create a new directory to put the git trees in and initialise it with fresh git metadata. Here we'll call the directory {{{cluster.gits}}} but the name doesn't matter: 
     
    2423}}}  
    2524 
    26 ==== Setting up remotes ==== 
     25== Setting up remotes == #remotes 
    2726 
    2827Now we add all of the trees we'll be working with as remotes. In this case I'll 
     
    6867}}} 
    6968 
    70 ==== Creating local tracking branches ==== 
     69== Creating local tracking branches == #local_branch 
    7170 
    7271Now before we do any work we have to create a local branch which is based on a remote branch and check it out. 
     
    109108}}} 
    110109 
    111 ==== Making changes and committing them ==== 
     110== Making changes and committing them == #making_changes 
    112111 
    113112To do some work on the gfs2 utils code we check out mygfs2-utils again and edit some code: 
     
    152151}}} 
    153152 
    154 ==== Cherry-picking patches ==== 
     153== Cherry-picking patches == #cherry_picking 
    155154 
    156155 
     
    166165}}} 
    167166 
    168 ==== Pushing changes ==== 
     167== Pushing changes == #pushing_changes 
    169168 
    170169In order to make sure no one has committed any conflicting changes since our