Making changes in EAP branch

[timfox]

Guys, please make sure you read this and take note.

If fixing stuff in the EAP branch (Branch_2_1) you MUST make sure the changes are applied in TRUNK too, or we will very quickly lose track of what has been fixed and where, and regressions will occur next time we svn copy TRUNK to form the next EAP branch.

Always apply fixes in TRUNK first then do a svn merge to put them in the EAP branch if possible.

Also make sure all fixes in the EAP branch are marked fixed against the EAP branch !!

Right now I don't see this happening and that's a recipe for disaster.

[timfox]

An example is this:

https://jira.jboss.org/browse/HORNETQ-502

I see this is commited in Branch_2_1 but there is no commit in TRUNK with the log HORNETQ-502

However, it is marked as fixed in 2.1.3! Which is TRUNK, but the commit is in the EAP branch.

[clebert.suconic]

I have everything in sync on trunk, except to HORNETQ-469 which is not stable, so I had to test/change everything on Branch_2_1 first and then apply it on trunk.

[clebert.suconic]

"but there is no commit in TRUNK"

I have played with merges with all my changes on journal and paging, look for commits with the word "merge".

"However, it is marked as fixed in 2.1.3! Which is TRUNK,"

I have been planning 2.1.3 to come from Branch_2_1

[clebert.suconic]

However, it is marked as fixed in 2.1.3! Which is TRUNK

It wouldn't make sense to make 2.1.3 from trunk, Branch_2_1 is *2.1*

The procedure is to have 2.1.X releases for EAP only from now on (with the exception of 2.1.3, where we will have a public release also), and have 2.2 on the community.

Talk to Andy Miller if you want to do it differently.

[timfox]

EAP is not *always* going to be based on HornetQ 2.1.

So any changes need to made in TRUNK too or we will get regressions when we resync with TRUNK

[timfox]

Branch 2_1 is not 2.1

Branch_2_1 is a special branch for EAP (it's badly named as I mentioned before)

All public releases need to come from TRUNK

[clebert.suconic]

I disagree with  you... Branch_2_1 is 2.1

Trunk is really unstable now.

trunk is for 2.2 release...

or else how you would call the releases for EAP?

As I said, talk to Andy miller if you disagree.