[hibernate-dev] forced update

[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 natural id loading
Applying: HHH-6974 - Add caching to new "load access" api for natural id loading
Applying: HHH-6974 - Add caching to new "load access" api for natural id loading
Applying: HHH-6974 - Add caching to new "load access" api for natural id loading
Applying: HHH-6656 - Document org.hibernate.service.classloading.spi.ClassLoaderService
Applying: HHH-6970 - Expand notion of "natural id mutability" to ternary value
Applying: HHH-6923 - Remove org.hibernate.service.instrumentation.spi.InstrumentationService
Applying: HHH-3910 - custom dirty flag tracking

It seems to me that these commits are currently missing on the current HEAD and should be pushed again. Right?

--Hardy



On Jan 24, 2012, at 9:56 AM, Hardy Ferentschik wrote:

> 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 found this http://drupal.org/node/1072534
> So it seems there was again a forced push to the main repo. This is annoying to
> say the least. I don't get how this can happen. A normal push will always 
> fail if it is not a fast forward. Just DO NOT force a push with '--force' in this case. PERIOD!
> 
> Instead sort out all conflicts, merges, etc locally until you have avast forward. 
> In the worst case reset your checkout to a "good" state via
> git reset --hard <hash-of-good-state> and start over
> 
> Unfortunately, it is not so easy to see where and how things went wrong. 
> 
> --Hardy
> 
> 
> 
> On Jan 24, 2012, at 5:54 AM, Steve Ebersole wrote:
> 
>> Maybe I am just paranoid because of the recent lost commits stuff, but 
>> today I did a pull and got this:
>> 
>> + d8d1019...92f42e7 3.6        -> origin/3.6  (forced update)
>> 
>> Why a force?  To the best of my knowledge I did not have any non-pushed 
>> commits on that 3.6 branch.
>> 
>> -- 
>> steve at hibernate.org
>> http://hibernate.org
>> _______________________________________________
>> 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