Only metamodel-related code was merged from the old metamodel branch into master, so there is definitely unmerged work still in metamodel-old. I would keep it around until things get sorted out.
----- Original Message ----- > From: "Steve Ebersole" <st...@hibernate.org> > To: "hibernate-dev" <hibernate-dev@lists.jboss.org> > Sent: Wednesday, October 29, 2014 4:00:38 AM > Subject: Re: [hibernate-dev] ORM master > > FYI, does anyone need metamodel-old anymore? Can I just delete that one > upstream? > > On Wed, Oct 29, 2014 at 6:00 AM, Steve Ebersole <st...@hibernate.org> wrote: > > > Ok, all done now. So at this point: > > > > 1) upstream/metamodel-old is the "metamodel" code as of the point before > > when we merged it to master > > 2) upstream/metamodel is the current state of metamodel work > > 3) upstream/master is currently the same as 4.3. It is the base from > > which I will start the discussed simplified 5.0 development > > > > > > > > On Wed, Oct 29, 2014 at 5:22 AM, Steve Ebersole <st...@hibernate.org> > > wrote: > > > >> I just noticed that the old metamodel branch was still around upstream. > >> So far I have: > >> > >> 1) moved upstream/metamodel -> upstream/metamodel-old > >> 2) deleted upstream/metamodel > >> 3) moved upstream/master -> upstream/metamodel > >> > >> I'll wait a few minutes still before deleting master and re-priming it > >> from 4.3 > >> > >> > >> On Wed, Oct 29, 2014 at 4:13 AM, Steve Ebersole <st...@hibernate.org> > >> wrote: > >> > >>> Per the face to face discussion yesterday (I'll send out more details > >>> later) I am working on branching master off to a new "metamodel" dev > >>> branch > >>> and priming a "new master" from 4.3 (the basic idea being to start work > >>> on > >>> a more targeted 5.0). > >>> > >>> Part of this is of course a massive change to the state of master > >>> upstream. If anyone needs me to wait before starting this please let me > >>> know immediately. Thanks. > >>> > >> > >> > > > _______________________________________________ > 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
