problems merging changes from master -> remote branch

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

problems merging changes from master -> remote branch

Arthur Richards-2
I am trying to merge a bunch of changes that have occurred in the master
branch of the MobileFrontend extension to a remote branch (esisupport), but
git review errors out, failing on a change that had been abandoned in the
remote branch.

First I merged the changes from master to a local checkout of the remote.
After fixing merge conflicts, I ran 'git review esisupport' and this is
what happened:

You have more than one commit that you are about to submit.
The outstanding commits are:

503bd3d (HEAD, esisupport) getArticleUrl returns canonical url (bug 41286)
8c70e8b Fix adding unnecessary callbacks in mf-cleanuptemplates
<snip>
Is this really what you meant to do?
Type 'yes' to confirm: yes
remote: Resolving deltas: 100% (315/315)
remote: Processing changes: refs: 1, done
To ssh://
[hidden email]:29418/mediawiki/extensions/MobileFrontend.git
 ! [remote rejected] HEAD -> refs/publish/esisupport/bug/41286 (change
32896 closed)
error: failed to push some refs to 'ssh://
[hidden email]:29418/mediawiki/extensions/MobileFrontend.git
'

What is going on? Am I doing this wrong? Thanks for any help!

--
Arthur Richards
Software Engineer, Mobile
[[User:Awjrichards]]
IRC: awjr
+1-415-839-6885 x6687
_______________________________________________
Wikitech-l mailing list
[hidden email]
https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Reply | Threaded
Open this post in threaded view
|

Re: problems merging changes from master -> remote branch

Roan Kattouw-2
On Fri, Nov 30, 2012 at 2:12 PM, Arthur Richards
<[hidden email]> wrote:
>  ! [remote rejected] HEAD -> refs/publish/esisupport/bug/41286 (change
> 32896 closed)
It looks like https://gerrit.wikimedia.org/r/#/c/32896/ is a commit
that you submitted to esisupport at some point, then abandoned, and
are now trying to push in again. Gerrit doesn't like that very much.
To fix it, you can try restoring the change (click Restore Change on
the Gerrit page for the change; you may need the author or a Gerrit
admin to do this for you, I don't know if we've managed to give
everyone permission to restore yet), then trying to run 'git review'
again. That should introduce new changes for the things you're
submitting, and create a new patchset for the change that was giving
you trouble.

Roan

_______________________________________________
Wikitech-l mailing list
[hidden email]
https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Reply | Threaded
Open this post in threaded view
|

Re: problems merging changes from master -> remote branch

Arthur Richards-2
Awesome Roan, thank you. That did the trick.

On Sat, Dec 1, 2012 at 3:30 PM, Roan Kattouw <[hidden email]> wrote:

> On Fri, Nov 30, 2012 at 2:12 PM, Arthur Richards
> <[hidden email]> wrote:
> >  ! [remote rejected] HEAD -> refs/publish/esisupport/bug/41286 (change
> > 32896 closed)
> It looks like https://gerrit.wikimedia.org/r/#/c/32896/ is a commit
> that you submitted to esisupport at some point, then abandoned, and
> are now trying to push in again. Gerrit doesn't like that very much.
> To fix it, you can try restoring the change (click Restore Change on
> the Gerrit page for the change; you may need the author or a Gerrit
> admin to do this for you, I don't know if we've managed to give
> everyone permission to restore yet), then trying to run 'git review'
> again. That should introduce new changes for the things you're
> submitting, and create a new patchset for the change that was giving
> you trouble.
>
> Roan
>
> _______________________________________________
> Wikitech-l mailing list
> [hidden email]
> https://lists.wikimedia.org/mailman/listinfo/wikitech-l
>



--
Arthur Richards
Software Engineer, Mobile
[[User:Awjrichards]]
IRC: awjr
+1-415-839-6885 x6687
_______________________________________________
Wikitech-l mailing list
[hidden email]
https://lists.wikimedia.org/mailman/listinfo/wikitech-l