1135698 - hg.m.o refuses hg push for central to aurora merge

Status: RESOLVED FIXED

(Developer Services :: General, task)

Description

[Rail Aliiev [:rail]]

The message is:
abort: push creates new remote head 25093037bf15 on branch 'COMM2000_20110114_RELBRANCH'!

The merge pulls from central, merges using hg debugsetparents, changes some configs, commits and pushes. The code lives here: http://hg.mozilla.org/build/mozharness/file/9d77397e3541/scripts/merge_day/gecko_migration.py#l219

I suspect this is related to bug 927219.

Comment 1

[Gregory Szorc [:gps]]

I suspect your copy of the Aurora repo is out of date and contains some stripped commits. Re-clone the repository and try again. (You may also want to do this for Beta as well.)

Comment 2

[Rail Aliiev [:rail]]

I deleted my local clones on Wednesday, after you mentioned that on IRC and cloned them later last week (I think on Friday). 

BTW, aurora-to-beta worked fine. I remember you saying that we may have some issues with central-to-aurora, probably related to https://bugzilla.mozilla.org/show_bug.cgi?id=927219#c53

Comment 3

[Gregory Szorc [:gps]]

Looks like some of the stripped bad branching closing commits were re-pushed on Friday.

I have re-stripped these bad commits to unblock merge day activities. I'll push proper branch closing commits after merge day has been completed to ensure this doesn't happen again.

Comment 4

[Rail Aliiev [:rail]]

Thanks!

FTR, I ran the following per gps' suggestion before pushing:

hg strip -r b58f17a50c16:be94effe221a

Comment 5

[Gregory Szorc [:gps]]

Push went through. Closing.