compared with
Version 4 by Darby Felton
on Jul 16, 2007 12:09.

Key
This line was removed.
This word was removed. This word was added.
This line was added.

Changes (1)

View Page History

h1. Development Tasks

h2. Performing a Checkout

Before starting any development work on the Zend Framework, whether on source code, documentation, or unit tests, you will need a Subversion working copy of the sources. In order to obtain a working copy of the Zend Framework, or some portion thereof, you may use the {{[svn checkout|http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.checkout.html]}} command, as in the following example, which checks out the entire framework trunk:

{code}
$ svn checkout http://framework.zend.com/svn/framework/trunk ZendFramework-trunk
{code}

h2. Switching a Working Copy between Branches

You can switch all or a portion of your working copy between two branches by using the {{[svn switch|http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.switch.html]}} command, as in the following example, where a working copy of the trunk is switched to a hypothetical purpose branch containing experimental Zend_View changes:

{code}
$ svn switch http://framework.zend.com/svn/framework/branch/Zend_View .
{code}

To switch back to the trunk, simply run the command again with the URL of the trunk:

{code}
$ svn switch http://framework.zend.com/svn/framework/trunk .
{code}

h2. Merging Changes

Merging changes from one branch to another is made quite simple in Subversion, since it is merely a copying of differences between revisions. Since, at the time of this writing, Subversion does not natively support merge tracking, it is very important to *note the applicable revision range for all merge operations in the commit message*, as in the following example:

{code}
$ svn merge -r 25:35 http://framework.zend.com/svn/framework/branch/Zend_View
...
$ svn commit -m 'Merge to trunk changes from the Zend_View branch r25 to r35'
{code}

By indicating the merged revisions in the commit message, it is simple to note which revisions have been merged and which have not. The {{[svn merge|http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.merge.html]}} command may be formulated in one of three ways; please see the SVN documentation for more information.

h2. Backward Incompatible Changes