Changes between Version 2 and Version 3 of CodeManagementReleaseProcess


Ignore:
Timestamp:
11/03/11 20:46:36 (5 years ago)
Author:
jim
Comment:

more git updates

Legend:

Unmodified
Added
Removed
Modified

  • CodeManagementReleaseProcess

    v2 v3  
    77The code for the website and other projects - like the Sharing Engine(s) - including all Drupal core, contrib and custom files (but excluding settings and uploaded assets) is stored in a set of Git repositories available at https://tech.transitionnetwork.org/trac/browser. 
    88 
    9 The code was previously in a SVN repository, details of which are at CodeManagementReleaseProcessOLD. 
     9The code was previously in a SVN repository, details of which are at CodeManagementReleaseProcessOld. 
    1010 
    1111== Principles == 
    … …  
    3131{{{ 
    3232cd /the/directory/you/want/the/project/folder/in 
    33 git clone ''USER''@dev.transitionnetwork.org:/web/tech.transitionnetwork.org/git/www/ 
     33git clone USER@dev.transitionnetwork.org:/web/tech.transitionnetwork.org/git/www/ 
    3434}}} 
    3535Where 'USER' is the account name of your SSH account on DEV. You'll be asked for your account password on DEV before Git copies the repository onto your machine. Also, the 'www' at the end of the second command can be exchanged for the other project folders, e.g. 'sharing-engine'. 
    … …  
    4444As you modify the source code and theme files on your checked out working copy, the differences between your copy and the Trunk will grow. It's wise therefore to do smaller chunks of work and commit once these specific bits are completed. Clearly, if several developers are working on the same areas at once, you will have to coordinate your work and be more careful. 
    4545 
    46 To update the Trunk (DEV) with the tested changes you've done so far: 
     46To update the Trunk (DEV) with the tested changes you've done so far [with information in square brackets]: 
    4747{{{ 
    4848cd /the/directory/you're/working/in 
    49 svn commit -m "A sensible description of what you've done" 
     49git add -A [this adds any files not already in the repo]] 
     50git commit -m "A sensible description of what you've done" [applies your changes locally] 
     51git push -u origin [pushes all updates back to repo, will need password] 
    5052}}} 
    5153Make sure you add a good description in case someone needs to roll back a commit to fix an issue. Then, repeat this step until you're ready to...