[hibernate-dev] Branching in HSEARCH

[Steve Ebersole]

Personally I see this as a pragmatic versus correct discussion.   To me,
once you release a final you should create it's branch.   The pragmatism
comes from the fact that following this "correct" approach causes a lot of
"extra work" (extra until there is an actual deviation).

I regularly do this too early in ORM and tend to regret it.   I'd lean
towards being pragmatic personally,  but of course I don't have a horse in
this race..

On Thu, Nov 5, 2015, 8:24 AM Gunnar Morling <gunnar at hibernate.org> wrote:

> 2015-11-05 15:11 GMT+01:00 Sanne Grinovero <sanne at hibernate.org>:
> > Hi,
> > I realize it was a mistake to create it that soon, but it's too late
> > now: we have contributions being developed from that branch.
>
> Who, where? I don't see any branch off 5.5 on GH. As said the branches
> are identical, so even if someone has developed off 5.5, it's trivial
> to rebase.
>
> >
> > Keep in mind 5.5 will definitely need long term maintenance as it's
> > the version picked for integration in WildFly 10 and all depending
> > platforms, so it's not that there's any chance to avoid this branch as
> > might sometimes have happened in the past.
> > The good news: as long as they don't really diverge, applying a PR to
> > both is absolutely trivial.
>
> Only it creates useless work right now. Just see this discussion for
> instance ;)
>
> >
> > One thing I don't buy: why is it confusing?
>
> Personally I find having to maintain two identical branches confusing.
> In the sense "WTH are we doing this".
>
> > This is exactly the same
> > process we've followed since many years, since ever we moved to Git.
> > Just normally we'll create it a bit later, as needed.. no big deal,
> > other than normally you might have to reopen closed JIRAs to fix the
> > versions. This might even sound better in that regard, and "as needed"
> > doesn't apply as we'll need this for sure.
>
> Sure, I understand it will be needed at *some point*, but it is not now.
>
> >
> > Thanks,
> > Sanne
> >
> > On 5 November 2015 at 08:46, Hardy Ferentschik <hardy at hibernate.org>
> wrote:
> >> On Thu, Nov 05, 2015 at 08:46:45AM +0100, Gunnar Morling wrote:
> >>> Sanne, all,
> >>>
> >>> Could we please drop the 5.5 branch in the upstream repo. It matches
> >>> exactly master (apart from the POM versions), so there is really no
> >>> good reason to have it at this point IMHO.
> >>
> >> +1
> >>
> >> --Hardy
> >> _______________________________________________
> >> hibernate-dev mailing list
> >> hibernate-dev at lists.jboss.org
> >> https://lists.jboss.org/mailman/listinfo/hibernate-dev
> > _______________________________________________
> > hibernate-dev mailing list
> > hibernate-dev at lists.jboss.org
> > https://lists.jboss.org/mailman/listinfo/hibernate-dev
> _______________________________________________
> hibernate-dev mailing list
> hibernate-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/hibernate-dev
>