947
edits
Auto-tools/Projects/Mozmill/RepoSetup: Difference between revisions
Auto-tools/Projects/Mozmill/RepoSetup (view source)
Revision as of 22:41, 28 September 2011
, 28 September 2011→Setting up for Development on 1.5.1: don't be overly specific
(→Setting up for Development on Master: change comments to comments that actually work in the shell) |
(→Setting up for Development on 1.5.1: don't be overly specific) |
||
| Line 19: | Line 19: | ||
Now you're in sync. Unless you're working on a maintenance release, skip down to "getting stuff done". | Now you're in sync. Unless you're working on a maintenance release, skip down to "getting stuff done". | ||
= Setting up for Development on 1.5 | = Setting up for Development on 1.5 = | ||
For work on a maintenance release of Mozmill, we'll use the maintenance release branch. Work for the next major version of Mozmill will be done against the "master" branch, which is already set up. Here's how to set up the maintenance branch on your system (Assuming you've already added mozautomation as a remote repository). | For work on a maintenance release of Mozmill, we'll use the maintenance release branch. Work for the next major version of Mozmill will be done against the "master" branch, which is already set up. Here's how to set up the maintenance branch on your system (Assuming you've already added mozautomation as a remote repository). | ||
Pull the 1.5 | Pull the 1.5 code into a local branch: | ||
<pre> | <pre> | ||
git fetch mozauto | git fetch mozauto | ||
git branch hotfix-1.5 | git branch hotfix-1.5 mozauto/hotfix-1.5 | ||
git checkout hotfix-1.5 | git checkout hotfix-1.5 | ||
</pre> | </pre> | ||
Now you're on a local branch called "hotfix-1.5 | Now you're on a local branch called "hotfix-1.5" with the 1.5 code. Use <tt>git checkout</tt> to switch between local branches. | ||
To keep your hotfix-1.5 | To keep your hotfix-1.5 branch updated with the changes to mozauto's 1.5 branch: | ||
<pre>git pull --rebase mozauto hotfix-1.5 | <pre>git pull --rebase mozauto hotfix-1.5</pre> | ||
= Getting Stuff Done = | = Getting Stuff Done = | ||