Here's a handy svn command to reapply changes committed on one branch
to a another one:
svn merge -r 409741:409742
https://svn.apache.org/repos/asf/incubator/activemq/trunk/
I used the above command on in the 4.0 branch directory to apply the
revision 409742 change I had done to the trunk back on the 4.0 branch.
Regards,
Hiram
On 5/29/06, Hiram Chirino <[EMAIL PROTECTED]> wrote:
ok the branch has been created.
On 5/26/06, Bruce Snyder <[EMAIL PROTECTED]> wrote:
> On 5/26/06, Hiram Chirino <[EMAIL PROTECTED]> wrote:
>
> > > If you don't think we should merge bug fixes from
> > > branches/activemq-4.0.x to the trunk, how do you propose we get bug
> > > fixes into the next major release?
> > >
> >
> > Bug fixes needs to be merged manually into trunk and all other
> > branches manually by the person committing the fix. So the net effect
> > is that we constantly merging in bug fixes to both the stable and
> > trunk branch at concurrently. We don't wait to 'roll up' all the bug
> > fixes on the stable branch so they are merged into trunk.
>
> +1 Sounds good to me.
>
> Bruce
> --
> perl -e 'print unpack("u30","D0G)[EMAIL
PROTECTED]&5R\"F)R=6-E+G-N>61E<D\!G;6%I;\"YC;VT*"
> );'
>
> Apache Geronimo - http://geronimo.apache.org/
> Apache ActiveMQ - http://incubator.apache.org/activemq/
> Apache ServiceMix - http://incubator.apache.org/servicemix/
> Castor - http://castor.org/
>
--
Regards,
Hiram
--
Regards,
Hiram
