compared with
Current by Ivo Jansch
on Apr 06, 2009 15:20.

(show comment)
This line was removed.
This word was removed. This word was added.
This line was added.

Changes (28)

View Page History
h1. Submitting a Bug Fix
<h1>Submitting a Bug Fix</h1>

First, ensure you have the latest development version of the framework by [checking out a copy from Subversion|Subversion Standards].
<p>First, ensure you have the latest development version of the framework by <ac:link><ri:page ri:content-title="Subversion Standards" /><ac:link-body>checking out a copy from Subversion</ac:link-body></ac:link>.</p>

<p>The easiest way to create a patch containing changes to multiple files, including new ones, is to add new files to your working copy. Then create the patch file using Subversion.</p>

{warning}If <ac:macro ac:name="warning"><ac:rich-text-body><p>If you have commit permissions, be sure not to commit your fix back to the Subversion repository inadvertently. Only the component lead should commit changes to his or her component.{warning} component.</p></ac:rich-text-body></ac:macro>

From the "trunk/" directory run the following command:
<p>From the &quot;trunk/&quot; directory run the following command:</p>

{noformat}svn diff <dirname> | tail -n +3 > <dirname>.diff{noformat}
<ac:macro ac:name="noformat"><ac:plain-text-body><![CDATA[svn diff <dirname> | tail -n +3 > <dirname>.diff]]></ac:plain-text-body></ac:macro>

Then remove the changes:
<p>Then remove the changes:</p>

{noformat}svn revert -R <dirname>{noformat}
<ac:macro ac:name="noformat"><ac:plain-text-body><![CDATA[svn revert -R <dirname>]]></ac:plain-text-body></ac:macro>

And patch from "trunk/":
<p>And patch from &quot;trunk/&quot;:</p>

{noformat}patch -p0 < <dirname>.diff{noformat}
<ac:macro ac:name="noformat"><ac:plain-text-body><![CDATA[patch -p0 < <dirname>.diff]]></ac:plain-text-body></ac:macro>

<p>Finally, submit your patch (this means: attach the file containing your patch to the issue in the issuetracker). Thanks for helping us improve Zend Framework!</p>

h2. Patching a Release Version
<h2>Patching a Release Version</h2>

<p>Bug fix patches that will be submitted for community review should be made using the latest development version of the framework. However, some individual situations might require patches for a release version, such as when your customers are using an application you've developed based on Zend Framework.</p>

<p>To create a patch, first change your current directory to one directory above the library directory.</p>

{noformat}cd /path/to/Zend_Framework/library/..{noformat}
<ac:macro ac:name="noformat"><ac:plain-text-body><![CDATA[cd /path/to/Zend_Framework/library/..]]></ac:plain-text-body></ac:macro>

<p>Now make a new copy of the original release version into the directory "library.original", &quot;library.original&quot;, and execute the following command:</p>

{noformat}diff --exclude='*.original' --exclude='*~' --exclude='*.rej' --ignore-space-change -ruN library.original/ library/ > ZF-ver-x.x-my-changes.patch{noformat}
<ac:macro ac:name="noformat"><ac:plain-text-body><![CDATA[diff --exclude='*.original' --exclude='*~' --exclude='*.rej' --ignore-space-change -ruN library.original/ library/ > ZF-ver-x.x-my-changes.patch]]></ac:plain-text-body></ac:macro>