[Qt-creator] work-flow/gerrit: branch with mixed reviews

[Alexandru Croitor]

qbs is a submodule of qtcreator, so assuming it's a merged commit, you just want to update the sha1 of the submodule.

If the qbs change you depend on in creator is not merged, then afaik you can't really do much, except cherry-picking / checking out the respective commit chains manually.

I don't think it's possible to push a creator commit with a submodule sha1 of a qbs commit that has not been merged. You can push it, but git submodule update will tell you it doesn't recognize the sha1.

On 10. May 2019, at 12:39, Christian Gagneraud <chgans at gmail.com<mailto:chgans at gmail.com>> wrote:

On Fri, 10 May 2019 at 22:37, Christian Gagneraud <chgans at gmail.com<mailto:chgans at gmail.com>> wrote:

On Thu, 9 May 2019 at 11:21, Christian Gagneraud <chgans at gmail.com<mailto:chgans at gmail.com>> wrote:

Hi there,

I'm working on a couple of fix/improvement, and i need to work on a
branch (from master) that require a cherry-pick from 4.9, and on top
of that 3 patches that need their own review.
So far, i'm doing lot of manual work to keep my work-flow and gerrit
happy, but surely there are better way to work. For example is it
possible to push only one commit to gerrit?
Say my stack is:
- master
- cherry-pick1-from-4.9
- review1
- review2
- wip

I'm currently using interactive rebase and/or transient branches to
place the correct commit on top of master before pushing to gerrit.
But that is a pain.

Any tip on how to manage that in an efficient and convenient way?

I just found out how that works! (Sorry for the dumb question)

Actually gerrit track all the reviews with Change-Id, so it's possible
to have a stack of commits, and push the branch to gerrit, all
associated reviews will get updated. Neat!

Now i have to sort out the reverse operation: How to pull the
said-branch, when it has changed on gerrit.
Typical use case is with 2 clones: say, one at work and one at home.

As well, i still have to discover how to track dependencies b/w
qt-creator and the qbs submodule, i have a qt-creator commit that
depends on a qbs commit...

Chris
_______________________________________________
Qt-creator mailing list
Qt-creator at qt-project.org<mailto:Qt-creator at qt-project.org>
https://lists.qt-project.org/listinfo/qt-creator

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.qt-project.org/pipermail/qt-creator/attachments/20190510/6a0f5814/attachment.html>