An example is this:
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.
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.
"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
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.
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
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
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.