openstack team mailing list archive
-
openstack team
-
Mailing list archive
-
Message #07697
Re: gerrit: basing a change on another uncommitted change
Hm. It shouldn't have uploaded a new patch set for 3990 if you did not modify the commit in 3990.
However, it does appear that you modified 3990's commit. This method was added:
test_get_rrd_server()
in nova/tests/test_xenapi.py
You can see it here:
https://review.openstack.org/#patch,unified,3990,7,nova/tests/test_xenapi.py
And click on the arrow for 'patch history' in upper left. Then select the differences between patch set 6 and patch set 7.
- Chris
On Feb 16, 2012, at 5:09 PM, Renuka Apte wrote:
> Hello,
>
> What is the right way to base a change on another uncommitted change?
>
> For example, I have https://review.openstack.org/#change,4267 based on top of https://review.openstack.org/#change,3990. I checked out 3990. Created a topic branch with "git checkout -b name". I committed my own change locally and then did "git review".
>
> This created the right dependency between the changes, but additionally, since git review does a rebase, it uploaded a new patch set to 3990. That was not what I expected (sorry Vish), and could be pretty harmful if 3990 had received all its reviews and was ready to be merged. How can I avoid this?
>
> Thanks,
> Renuka.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~openstack
> Post to : openstack@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~openstack
> More help : https://help.launchpad.net/ListHelp
Follow ups
References