On 03/09/10 12:46, MJ Ray wrote:
Adding version control: commit A, make new branch, copy A2 over the working copy (A) and commit, return to master branch (so making the working copy A again), copy B over the working copy (A) and commit, return to new branch (which is A2) and merge master (which changed from A to B since the branch point) onto it, resulting in your B2. That's with git but similar concepts probably work with others.
OK, so I have done this but I'm not sure I have got everything right - ZenCart's own sanity checks don't seem to think I'm running the version I think I'm running.
Can you (or anyone else!) sanity check what I did so I can rule out the git merge side of things?
cp -a /path/to/zencart/zen-cart-v1.3.8a-full-fileset-12112007 htdocs git init git add . git commit -m'ZenCart 1.3.8a'
git checkout -b "MySite138a" master rm -rf htdocs cp -a /path/to/mysite/htdocs . git add . git commit -a -m'MySite 1.3.8a'
git checkout master rm -rf htdocs cp -a /path/to/zencart/zen-cart-v1.3.9f-full-fileset-08142010 htdocs git add . git commit -a -m'ZenCart 1.3.9f'
git checkout MySite138a git merge master git add . git commit -a -m'MySite 1.3.9f'