| | 86 | == managing a vendor branch == |
| | 87 | [http://lookfirst.com/2007/11/subversion-vendor-branches-howto.html reference] |
| | 88 | |
| | 89 | This is an example script of how I do an upgrade from version 5.5.0 to 5.5.7. This assums that 5.5.0 has already been added using steps similar to below. |
| | 90 | |
| | 91 | 1. wget http://domain/jive_software_5.5.7.zip |
| | 92 | 2. unzip jive_software_5.5.7.zip |
| | 93 | 3. svn co -N http://svn/vendor/jivesoftware jivesoftware |
| | 94 | 4. mv jive_software_5.5.7 jivesoftware |
| | 95 | 5. cd jivesoftware |
| | 96 | 6. svn add jive_software_5.5.7 |
| | 97 | 7. svn ci -m 'adding a clean download of 5.5.7' |
| | 98 | |
| | 99 | Now, the whole concept of the upgrade can be imagined with this simple statement: "I would like to take the difference between version 5.5.0 and 5.5.7 and apply that to what is in my development environment". In order to accomplish this, I check out my development tree locally and then execute a merge of the diff of the two versions. |
| | 100 | |
| | 101 | 1. svn co http://svn/dev/jive jive-dev |
| | 102 | 2. cd jive-dev |
| | 103 | 3. svn merge --ignore-ancestry http://svn/vendor/jivesoftware/jive_software_5.5.0/ http://svn/vendor/jivesoftware/jive_software_5.5.7/ . |
| | 104 | 4. svn ci -m 'upgraded development environment to 5.5.7' |
| | 105 | |
| | 106 | Note: if there are any conflicting files, you will need to resolve those conflicts before checking in. However, as you can see, you can locally modify any of the jive software files and the diff process will take care of doing the merges for you. |
| | 107 | |
