Re: [hibernate-dev] forced update

2012-01-24 Thread Steve Ebersole
3.6 has been recovered by essentially spinning back to 3.6.9. If you did any pushes to the 3.6 branch since then you will need to reapply those changes. On Tue 24 Jan 2012 09:00:07 AM CST, Steve Ebersole wrote: > 4.0 has just been recovered. If you pushed any changes to the 4.0 > branch after

Re: [hibernate-dev] forced update

2012-01-24 Thread Steve Ebersole
4.0 has just been recovered. If you pushed any changes to the 4.0 branch after it was branched off of master you will need to reapply those changes. We are still working on 3.6 On 01/24/2012 03:07 AM, Hardy Ferentschik wrote: > >> No, master is 4.1, not 4.0 anymore, so I would expect some cha

Re: [hibernate-dev] forced update

2012-01-24 Thread Hardy Ferentschik
> No, master is 4.1, not 4.0 anymore, so I would expect some changes, > just I don't know myself what I would need to expect there. These > might be good. Ahh, of course, I forgot about the 4.1 branch. Well, then I am not so sure either anymore. > But yes those are the same differences I'm see

Re: [hibernate-dev] forced update

2012-01-24 Thread Sanne Grinovero
On 24 January 2012 09:00, Hardy Ferentschik wrote: > HI, > > I did: > > git rebase origin/4.0 > > and got > > git rebase origin/4.0 > First, rewinding head to replay your work on top of it... > Applying: HHH-6994 - Have EntityEntry fire notification to PersistenceContext > on loadedState being up

Re: [hibernate-dev] forced update

2012-01-24 Thread Hardy Ferentschik
HI, I did: git rebase origin/4.0 and got git rebase origin/4.0 First, rewinding head to replay your work on top of it... Applying: HHH-6994 - Have EntityEntry fire notification to PersistenceContext on loadedState being updated Applying: HHH-6974 - Add caching to new "load access" api for nat

Re: [hibernate-dev] forced update

2012-01-24 Thread Sanne Grinovero
This not looking good at all; I just tried myself to "git fetch upstream" and got : From github.com:hibernate/hibernate-orm + d8d1019...92f42e7 3.6-> upstream/3.6 (forced update) + 78d07a3...88c08c0 4.0-> upstream/4.0 (forced update) fb3566b..6258df4 master -> upstream/m

Re: [hibernate-dev] forced update

2012-01-24 Thread Hardy Ferentschik
Hi, I got the same message, but not only on 3.6 >From github.com:hibernate/hibernate-orm + d8d1019...92f42e7 3.6-> origin/3.6 (forced update) + e518133...88c08c0 4.0-> origin/4.0 (forced update) 7a31958..6258df4 master -> origin/master Updating 7a31958..6258df4 I fou