any good links for a basic SVN software primer out there? maybe something cake related
On May 6, 12:45 pm, Stephen Cuppett <st...@cuppett.com> wrote: > I have made a couple customizations to CakePHP proper, first in 1.1.x and > then a few less in the 1.2.x series. The way that I handle upgrades is > within a single commit in my repository covering the complete change, in > this case 1.2.2 to 1.2.3. > > You can do this pretty easily with KDiff3 (Linux/UNIX or Windows). I follow > the steps below: > > 1. Extract my application from SVN (to get rid of .svn cruft, etc) > 2. Extract cakephp-1.2.2.zip > 3. Extract cakephp-1.2.3.zip > > Using KDiff3, do a 3-way merge into a new directory: > > A: Directory housing 1.2.2 > B: Directory housing your application > C: Directory housing 1.2.3 > > Merge the 3 into a new directory. The merge will automatically keep all the > extra stuff in B that relates to your application and should be able to > handle most things that are from A -> C without too many problems. As I > said, in my case, there are a few customizations to the base CakePHP stuff > that need some manual intervention, but this can all be handled right within > KDiff3. > > Once the merge is done, you can just drop your resulting (merged) directory > over the original location in your SVN folder and you should see what has > changed (either in the explorer or via svn diff) and commit it in a single > revision. This makes it easier to also revert it out of your project if > something goes really hooey. I also tend to store the cake zip file in the > repository too, so the revision will also have a delete and add for the zip > files to further illustrate the version change. > > Upgrading from 1.1.x to 1.2.x was a little trickier to get right in a single > commit because there were file moves, deletions, additions, etc. However, > I've used this process all through 1.1.x and then through each 1.2.x release > without incident. > > Hope this helps, > > Steve > > Stephen Cuppetthttp://www.stephencuppett.com > steve at cuppett dot com > > George Burns <http://www.brainyquote.com/quotes/authors/g/george_burns.html> > - "Happiness is having a large, loving, caring, close-knit family in > another city." --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "CakePHP" group. To post to this group, send email to cake-php@googlegroups.com To unsubscribe from this group, send email to cake-php+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/cake-php?hl=en -~----------~----~----~----~------~----~------~--~---
