fuel-dev team mailing list archive

[Dmitry Borodaenko <dborodaenko@xxxxxxxxxxxx>]

Team,

I'd like to draw your attention to the last two sections of the
OpenStack Gerrit Worflow document:
https://wiki.openstack.org/wiki/Gerrit_Workflow#Updating_a_Change

Please read them carefully, make sure you understand what they do, try
them out, and get a habit of using them where relevant.

It's important that you know how to update a change, so that you don't
have to create a new review request that won't have the old comments
and won't allow you to easily diff between patchset versions.

Don't:
https://blueprints.launchpad.net/fuel/+spec/nailgun-agent-handler
https://review.openstack.org/70758
https://review.openstack.org/76831

Do:
https://review.openstack.org/33409

So that you can:
https://review.openstack.org/#/c/33409/55..60/nova/virt/libvirt/imagebackend.py
(UI way: open a side-by-side diff, then click Patch Sets, and pick a
patch set version to compare against)

It's also important to know when you need to declare that your patchs
depend on another patch that is currently under view. Unnecessary
dependencies slow things down because your patch can't be merged until
all its dependencies are merged. However, if you are modifying the
same file as some other patch, there's a good chance your patches will
conflict with each other, and one patch will become unmergeable.

If you see a possible conflict, figure out between yourself and the
other developer which patch should go in first (usually the least
intrusive one), and rebase later patch over the earlier one before
resubmitting with "git review". Chances are you'd have to do such
rebase anyway, but now that you have done it in advance, you won't be
introducing new merge conflicts.

Examples:
https://review.openstack.org/77643
https://review.openstack.org/59149

Thank you,

-- 
Dmitry Borodaenko