Ask Your Question
0

how to request code review

asked 2015-03-30 10:32:17 -0500

hfamily15 gravatar image

updated 2015-03-30 13:09:55 -0500

SGPJ gravatar image

Hi all I am trying to bug fix. but, I failed to request code review like below

'

# git review <br>
remote: Resolving deltas: 100% (6/6)
remote: Processing changes: refs: 1, done

To ssh://Hahyun@review.openstack.org:29418/openstack/cinder.git ! [remote rejected] HEAD -> refs/publish/master/bug/1433450 (you are not allowed to upload merges) error: failed to push some refs to 'ssh://Hahyun@review.openstack.org:29418/openstack/cinder.git

I have launchpad id, gerrit username, github username etc..

My steps are below:
1) git clone
2) cd cinder
3) git review -s
4) git checkout -b bug/1437794
5) change the code
6) git add [changed file]
7) git commit -a
8) git review

What should I do for bug fix? I cannot understand why "git review" was failed. please someone help me.

thanks in advance.

edit retag flag offensive close merge delete

1 answer

Sort by ยป oldest newest most voted
0

answered 2015-03-30 11:20:26 -0500

updated 2015-03-30 13:52:46 -0500

You might want to try starting over from the clone step. The error message "you are not allowed to upload merges" implies that at some point between the clone and the review you did a git pull or something similar which has introduced a merge commit into your bug/1437794 topic branch that doesn't exist in the master branch. Our Gerrit ACLs explicitly prevent inclusion of merge commits in normal code review.

Alternatively, if you're a seasoned Git user, it should just be a matter of inspecting your current commit history and rebasing your commit on top of something which is present in the remote branch (for example, the branch tip commit).

edit flag offensive delete link more

Comments

Thank you very much. I should check again. Thanks

hfamily15 gravatar imagehfamily15 ( 2015-03-31 04:53:16 -0500 )edit

Your Answer

Please start posting anonymously - your entry will be published after you log in or create a new account.

Add Answer

Get to know Ask OpenStack

Resources for moderators

Question Tools

1 follower

Stats

Asked: 2015-03-30 10:32:17 -0500

Seen: 364 times

Last updated: Mar 30 '15