Re: svn commit: r20745 - branches/1.4.x

kou@tigris.org wrote:
> Author: kou
> Date: Wed Jul 19 08:30:10 2006
> New Revision: 20745
>
> Modified:
> branches/1.4.x/STATUS
>
> Log:
> * STATUS: Nominate r20741 and r20743.
>
>
> Modified: branches/1.4.x/STATUS
> URL: http://svn.collab.net/viewvc/svn/branches/1.4.x/STATUS?pathrev=20745&r1=20744&r2=20745
> ==============================================================================
> --- branches/1.4.x/STATUS (original)
> +++ branches/1.4.x/STATUS Wed Jul 19 08:30:10 2006
> @@ -38,5 +38,14 @@
> Votes:
> +1: dlr
>
> + * r20741, r20743
> + Fix a segmentation fault bug when an error is occurred in log message
> + callback.
> + Branch: r20741
> + Justification:
> + A segmentation fault bug is critical bug.
> + Votes:
> + +1: kou

Hi Kouhei,

The way we commonly do merges for backports from trunk into a release branch is
to branch from the 1.x.y branch and then merge the revision in from trunk, then
in a separate commit, make any fixes for it to work on the branch. Then the
STATUS file contains only revisions to merge from the newly created branch.

Also, you might want to change the message to indicate that the segmentation
fault is in the Ruby bindings, otherwise, somebody needs to look up the log
message for the revisions.

Regards,
Blair

-- 
Blair Zajac, Ph.D.
<blair@orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org