Hi Steve,
I don't particularly like it.
We have very few resources to work on 5.x and clearly we won't be able to
do that + learn about 6 in parallel and fix issues in both, probably in 2
completely different ways. And we won't really be able to know if it
doesn't work because it's not implemented yet, not fully functional, same
buggy or new buggy.
We don't push that many things to 5.x so maybe you could explain why the
merges are so painful so that we can try to make them less so?
--
Guillaume
On Thu, Dec 6, 2018 at 1:53 PM Steve Ebersole <steve(a)hibernate.org> wrote:
Today, I promise ;), I will release 6.0 Alpha1. But I wanted to
start a
discussion about managing the master and 6.0 branches in terms of
commit/push. To date we (mostly Andrea and Chris, thanks guys!) have had
to perform very painful "merging" from master to 6.0. As 6.0 was in a
pre-Alpha state, that was fine. However, now that we are starting the
Alpha release cycle, that is no longer reasonable. So as of today we
really need a new strategy here. However it works out, changes made to
master than also affect 6.0 should be done in both places.
This has 2 benefits IMO:
1. Obviously it removes the need to perform these massive,
time-consuming "merges"
2. A great side effect is that it gets people with 6.0 code base
differences.
_______________________________________________
hibernate-dev mailing list
hibernate-dev(a)lists.jboss.org
https://lists.jboss.org/mailman/listinfo/hibernate-dev