Magento upgrading with Git

I am about to upgrade our Magento store from 1.5.0 to 1.6.0, I know how I want to do it, but I'm a little unsure on the commands I needs to use.

For starters I have my current store on our production server, I have git setup and a duplicate of the repo is on our Beanstalk account. I have a full history of changes etc. within that repo and would ideally like to keep those in place.

I have a theme that we purchased and then quite heavily optimised but thankfully almost all optimisations are within an override.css file. Although, there are a few minor code changes within the theme files themselves.

As Magento use SVN as their CVS I have found (on Github) a mirror of Magento releases.

So, so far I have three locations that I would like to 'merge':

1. Production (git)
2. Magento mirror (git)
3. Theme (not git or svn, plain old directories)

I was thinking of adding the Magento mirror as a branch to my existing git repo, calling it 1.6.0 or similar. Then somehow pulling the plain theme dir开发者_如何学运维ectories and file into the master branch...

Am I on the right lines?

I was also thinking, to protect the production site, of adding a staging version of the website to run these merges on to test them.

It's rather easy but you have to ensure that your site is based on some master repo that can be merged down the stream with earlier versions (repo that has all Magento versions as tags or branches that can be merged to latest from first). So here's two scenarios to follow

1. My site is not in git

1. start by cloning from master repo that has all magento versions (at least to the version you are currently using)
2. get your clone and checkout new branch with the version you are currently using
3. copy over your current site to this version
4. after that done "git status" will show you the diff with original version you started with and all the edits you have made to it
5. its now smart to move all core edits to local codepool and revert any changes in core to original files, move any edts in default or base templates to your own template and revert changes in default or base template files. Same goes with all the files that look modified against the original version. This gives you "all my changes are separate from original code and they will not conflict my upgrades", it's wise to commit this state
6. If all things are separated from original files then it's time to upgrade. Turn on default theme, disable all local and community extensions , merge the new version with your current branch. Visit the site to perform the upgrade
7. Now your site is upgraded and you can turn on your theme and custom extensions one by one to see what is compatible and what not. Debug and solve one by one

My site is already in git

1. if it is based on repo that has all versions you are in good condition (skip 2)
2. if it's not then you can add some repo that has it all as your remote and start with merging your current version and separating changes from original like described in first scenario
3. make a new branch of your current site used
4. merge with new version
5. disable all local, community extensions, turn on default theme, and upgrade
6. enable theme, extensions one by one and debug where conflicts happen

It's common to have a git setup like follows:

• MAGENTO MASTER -> REMOTE ORIGN THAT HAS ALL MAGENTO VERSIONS

• YOUR MASTER -> REMOTE ORIGIN IS MAGENTO MASTER

  • branch: yoursite_dev
  • branch: yoursite_stage
  • branch: yoursite_live

You always develop on your_dev branch andif changes are ready for evaluation you merge _stage with _dev and if changes are approved you merge the state to _live either from _dev or from _stage.

commands based on theoretical endpoints

git clone git://github.com/speedupmate/Magento-CE-Mirror.git yourprojectdir 
cd yourprojectdir
git fetch --tags
git tag
git checkout -b yoursite_dev magento-1.5.0.1
git checkout -b yoursite_stage yoursite_dev
git checkout -b yoursite_live yoursite_dev
git checkout yoursite_dev
git branch
//copy in your site
//separate changes or originals
//add any file/dir with local importance to .gitignore
//turn of your default theme, disable all local/community extensions and overrides
//assuming you are on dev branch commit your clean state 
git merge magento-1.6.0.0
//visit the site to execute the upgrade 
//enable your theme , extensions , debug

this gives you a starting point for scenario 1 and after that you could just copy in your site and start separating changes and making order in your current site and themes