On Thu, 6 Dec 2018 at 13:17, Guillaume Smet <guillaume.s...@gmail.com> wrote: > > 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?
It's 200,000 lines of code difference. Just don't make any change on 5 - it's not a good use of our time either, since the future is 6. As you said in the previous paragraph, we're a small team and we can't keep developing 2 branches of the same project. 5.x needs to be moved into strictly maintenance only, so please stop pushing big changes to 5.x unless there's a very important reason - we need to move on towars a situation in which all innovation happens on 6 aka master. Thanks, Sanne > > -- > Guillaume > > > On Thu, Dec 6, 2018 at 1:53 PM Steve Ebersole <st...@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@lists.jboss.org > > https://lists.jboss.org/mailman/listinfo/hibernate-dev > > > _______________________________________________ > hibernate-dev mailing list > hibernate-dev@lists.jboss.org > https://lists.jboss.org/mailman/listinfo/hibernate-dev _______________________________________________ hibernate-dev mailing list hibernate-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/hibernate-dev
