216
edits
Drumbeat/website/deployment: Difference between revisions
Jump to navigation
Jump to search
→Drumbeat Website Deployment
Theinterned (talk | contribs) |
Theinterned (talk | contribs) |
||
| Line 5: | Line 5: | ||
In the following 'recipes' we are assuming that: | In the following 'recipes' we are assuming that: | ||
1. Your local SVN checkout of Trellon's drumbeat repository trunk is at the path <trellon_drumbeat> | |||
2. You have the entire drumbeat tree checked out from svn.mozilla.org to your machine at the path <moz_drumbeat> | |||
==Moving changes from Trellon's SVN into Mozilla's== | ==Moving changes from Trellon's SVN into Mozilla's== | ||
1. Check out / update mozilla svn: | |||
<moz_drumbeat> $ svn co svn+ssh://YOU@svn.mozilla.org/projects/crm/ . | <moz_drumbeat> $ svn co svn+ssh://YOU@svn.mozilla.org/projects/crm/ . | ||
OR | OR | ||
<mo_drumbeat> $ svn up | <mo_drumbeat> $ svn up | ||
2. update your working copy of the trellon SVN: | |||
<trellon_drumbeat> $ svn up | <trellon_drumbeat> $ svn up | ||
3. Copy your changed files from your working copy to your checkout of <moz_drumbeat>/trunk | |||
4. Check your changes: | |||
<moz_drumbeat>/trunk/ $ svn diff | <moz_drumbeat>/trunk/ $ svn diff | ||
5. Commit your update to trunk: | |||
<moz_drumbeat>/trunk/ $ svn ci -m "My very useful commit message." | <moz_drumbeat>/trunk/ $ svn ci -m "My very useful commit message." | ||
==Updating the Staging server from Mozilla's trunk== | ==Updating the Staging server from Mozilla's trunk== | ||
1. Check out / update mozilla svn: | |||
<moz_drumbeat> $ svn co svn+ssh://YOU@svn.mozilla.org/projects/crm/ . | <moz_drumbeat> $ svn co svn+ssh://YOU@svn.mozilla.org/projects/crm/ . | ||
OR | OR | ||
<moz_drumbeat> $ svn up | <moz_drumbeat> $ svn up | ||
2. Migrate the latest trunk to staging by merging trunk with tags/staging | |||
<moz_drumbeat> $ cd /tags/staging | <moz_drumbeat> $ cd /tags/staging | ||
<moz_drumbeat>/tags/staging $ svn merge svn+ssh://svn.mozilla.org/projects/crm/trunk | <moz_drumbeat>/tags/staging $ svn merge svn+ssh://svn.mozilla.org/projects/crm/trunk | ||
3. Check your changes: | |||
<moz_drumbeat>/tags/staging $ svn diff > diff.txt | $EDITOR | <moz_drumbeat>/tags/staging $ svn diff > diff.txt | $EDITOR | ||
4. Commit your changes: | |||
<moz_drumbeat>/tags/staging $ svn ci -m "My very useful commit message." | <moz_drumbeat>/tags/staging $ svn ci -m "My very useful commit message." | ||
5. Note that the Staging server is updated form the staging tag every _30 minutes_ so you will have to wait for your cahnges to show up! | |||