[Qt-creator] Need help with git and gerrit

[Jochen Becher]

Hi,

found my mistake, had to reset to gerrit/master instead of my local
master which introduced the merge into the history of the new topic
branch.

Regards, Jochen


Am Sonntag, den 16.08.2015, 12:46 +0200 schrieb Jochen Becher:
> Hi,
> 
> I am lost with git and gerrit: The las patch set of one of my changes is
> 6 weeks old. I tried to upload a new patch set but failed: 
> 
> I created a new topic branch, merged all changes from the old topic
> branch (which I found to chaotic after all the changes and merges I did
> in the past), reset to gerrit/master, did the commit (which correctly
> contained only the changes I expected) and pushed it to gerrit using the
> old commit message and change id. I got the following reply:
> 
> /usr/bin/git push gerrit 4271fd4:refs/for/master
> remote: Resolving deltas: 100% (228/228)        
> remote: Processing changes: refs: 1, done            
> The command "/usr/bin/git" terminated with exit code 1.
> To ssh://gilead@codereview.qt-project.org:29418/qt-creator/qt-creator
>  ! [remote rejected] 4271fd4 -> refs/for/master (you are not allowed to
> upload merges)
> error: Fehler beim Versenden einiger Referenzen nach
> 'ssh://gilead@codereview.qt-project.org:29418/qt-creator/qt-creator'
> 
> 
> The change id is: I981e38a10fff1c1792f285d5837553aa7596cd2f.
> 
> How do I create a fresh commit from a different topic branch as a new
> patch set?
> 
> Regards, Jochen
> 
> 
> _______________________________________________
> Qt-creator mailing list
> Qt-creator at qt-project.org
> http://lists.qt-project.org/mailman/listinfo/qt-creator