Re: [hibernate-dev] Branching in HSEARCH
On 5 November 2015 at 14:23, Gunnar Morling <gunnar(a)hibernate.org> wrote:
2015-11-05 15:11 GMT+01:00 Sanne Grinovero
<sanne(a)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.
GH doesn't give you an overview of people's hard drives, and while
it's all trivial for us it's not trivial at all for people not using
Git on a day to day.
> 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 ;)
Right. Just stop it ;)
I already admitted it was a mistake: you're right on that, but at this
point it's just cheaper to keep it, not to mention that we shouldn't
be deleting published branches from the reference repository.
As I said we'll need this branch soon enough, it's far less work to
merge a couple PRs on both branches than to re-base next week and go
fix all versions on JIRA issues and reconfigure Jenkins, etc..
Sanne
> 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(a)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(a)lists.jboss.org
>> https://lists.jboss.org/mailman/listinfo/hibernate-dev
> _______________________________________________
> hibernate-dev mailing list
> hibernate-dev(a)lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/hibernate-dev