merging changes in plone

During development it is common practice to maintain a copy of the live site so that changes can be tested without breaking the live site.  Changes made on the development site are often stored in the ZODB via the customs folder.  However, before moving changes to the live site it is important to store them in svn.  Here is the process of moving changes from the customs folder into svn:

1) Use customDumper to dump customs folder to the filesystem

2) Zip the customs folder and move it to the home directory

3) From there, sftp and retrieve the zip file

4) Unzip the file into the products directory

5) Do a diff -r –brief custom product_name | grep “^Files”

6) Move those files which have changed from the customs folder into the product’s skins folder

7) Do a commit, and now you are done.

Share and Enjoy:
  • Digg
  • del.icio.us
  • Facebook
  • Google Bookmarks
  • Slashdot
  • StumbleUpon
  • Technorati
  1. No comments yet.

  1. No trackbacks yet.