1368522 - We're sorry - something has gone wrong while rewriting or rebasing your commits. The commits being pushed no longer match what was requested

Status: RESOLVED WORKSFORME

(Conduit Graveyard :: Transplant, enhancement)

Description

[Nevin Chen(Not active on Bugzilla)]

In Bug 1358117 comment 30
When I pull the patch from m-c using mozreview with eaa41063a8539f7051f07d2e4a7916257182f638

I found there are two addtional patch unrelated to Bug 1358117 

    Bug 1365089 - Add MOZ_ANDROID_MMA and --with-leanplum-sdk-keyfile to configure. r=chmanchester
    MozReview-Commit-ID: 28Ch08Ixi6H
and
    Bug 1365089 - Pre: Support setting default keyfile locations in moz.configure. r=chmanchester
    MozReview-Commit-ID: 207kgPU2TPM

May I know is there a way to fix it? 
I don't know what's going on and what does Bug 1358117 comment 30  means and what trouble did it cause.

To me, when I look at m-c today, My patch eaa41063a8539f7051f07d2e4a7916257182f638 is landed perfectly.

I've visited related bugs like Bug 1264962, Bug 1253393...and got I conclusion.
There's no extra action for me now cause my patch is landed.

Comment 1

[Nevin Chen(Not active on Bugzilla)]

Hi Nick
Please correct me if I'm wrong.

Comment 2

[Nick Thomas [:nthomas] (UTC+12)]

I'm not sure what you're asking, and don't have any background knowledge on mozreview that might be helpful here.

Comment 3

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

Any chance you (or someone else) accidentally re-requested autoland for that patch a day or two after it originally landed? 

:Gps could probably speak to the Mercurial end of what's happening, :glob could probably speak to the mozreview/autoland side.

Comment 4

[Gregory Szorc [:gps]]

I think what happened is:

1) autoland request initiated
2) MozReview review request updated with new commits
3) autoland processed initial request and complained that the source had changed

It does this to avoid ambiguities about what should land and to close a security hole.

The only potential bug here would be to improve the messaging. Reopen if you feel that would be useful.