Hi Vlad, Not sure if it's better to partially push the commits or to have them in a list to deal with later (tests + commit). What do the others think about it? On Wed, Dec 19, 2018 at 6:37 PM Vlad Mihalcea <mihalcea.vlad(a)gmail.com&gt; wrote: > I have merged some PRs and have some commits still left to integrate into > 6. Indeed that some if them cannot be fully integrated because they rely on > non-implemented functionality. But I'll add the tests in the pending tests > folder. > > Vlad > > On Wed, 19 Dec 2018, 18:19 Guillaume Smet <guillaume.smet(a)gmail.com wrote: > >> Hi, >> >> We had the first 5 -> 6 merge meeting with Chris yesterday. We >> cherry-picked all the simple things but there were a few more problematic >> things: >> - things that needs to be ported soon but weren't a simple cherry-pick >> - things that cannot be ported right now because not yet available in 6 >> >> We decided to push a document in the 6 tree containing the status so that >> we have proper versioning: >> https://github.com/hibernate/hibernate-orm/blob/wip/6.0/MERGE_STATUS.adoc >> >> Andrea, Chris and Vlad each have one issue affected. Maybe let's try to >> target the next meeting as the limit for merging them (or push them to >> kept >> for later), probably January 8th-9th. >> >> When you're done with a merge, please remove the related content from the >> document so that we can keep track of things. >> >> Thanks. >> >> -- >> Guillaume >> _______________________________________________ >> 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

Ok, I'll add the commits that cannot be integrated to the Google Docs list then. Vlad On Thu, Dec 20, 2018 at 7:30 AM Steve Ebersole <steve(a)hibernate.org&gt; wrote: > Seems to me it would be better to wait until the whole commit can be > integrated. Just seems like it would be easier to keep track of > > > On Wed, Dec 19, 2018, 3:25 PM Guillaume Smet <guillaume.smet(a)gmail.com&gt; > wrote: > >> Hi Vlad, >> >> Not sure if it's better to partially push the commits or to have them in >> a >> list to deal with later (tests + commit). >> >> What do the others think about it? >> >> On Wed, Dec 19, 2018 at 6:37 PM Vlad Mihalcea <mihalcea.vlad(a)gmail.com&gt; >> wrote: >> >> > I have merged some PRs and have some commits still left to integrate >> into >> > 6. Indeed that some if them cannot be fully integrated because they >> rely on >> > non-implemented functionality. But I'll add the tests in the pending >> tests >> > folder. >> > >> > Vlad >> > >> > On Wed, 19 Dec 2018, 18:19 Guillaume Smet <guillaume.smet(a)gmail.com >> wrote: >> > >> >> Hi, >> >> >> >> We had the first 5 -> 6 merge meeting with Chris yesterday. We >> >> cherry-picked all the simple things but there were a few more >> problematic >> >> things: >> >> - things that needs to be ported soon but weren't a simple cherry-pick >> >> - things that cannot be ported right now because not yet available in >> 6 >> >> >> >> We decided to push a document in the 6 tree containing the status so >> that >> >> we have proper versioning: >> >> >> https://github.com/hibernate/hibernate-orm/blob/wip/6.0/MERGE_STATUS.adoc >> >> >> >> Andrea, Chris and Vlad each have one issue affected. Maybe let's try >> to >> >> target the next meeting as the limit for merging them (or push them to >> >> kept >> >> for later), probably January 8th-9th. >> >> >> >> When you're done with a merge, please remove the related content from >> the >> >> document so that we can keep track of things. >> >> >> >> Thanks. >> >> >> >> -- >> >> Guillaume >> >> _______________________________________________ >> >> 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 >> >