On 19 February 2015 at 09:35, Mateusz Loskot <[email protected]> wrote: > I've opened GitHub issue [2] devoted to discussion it further > and prepare the submission through Gerrit.
Finally, we've decided to work in Gerrit from the start [0], in a new long-living branch (we've got wip/boostbuildprojectmanager there). I've configured my local clones for Gerrit set up according to [1] and I've familiarised myself with [2] and [3]. Now, I've got some Gerrit workflow issues I'd like to clarify. I'm not the only contributor who is going to work on the contribution and there will be numerous iterations of update of our Change in Gerrit. The intro [2] says "Each time a Change is updated, it gains a new Patch Set", where a new Patch Set contains commits (initial or updated) ready for review. There is no way to push updates without creating new Patch sets. How to arrange iterative intermediate updates, before requesting review? For example, let's assume we start working on the contribution as follows: 1. Import current sources of our plugin into wip/boostbuildprojectmanager 2. git push gerrit HEAD:refs/wip/boostbuildprojectmanager (?) 3. Developers A and B pull the changes 4. Developer A commits some coding style corrections 4.1 git push gerrit HEAD:refs/wip/boostbuildprojectmanager (?) ...nothing ready for review yet... 5. Developer B updates his clone, then commits some more style corrections 5.1 git push gerrit HEAD:refs/wip/boostbuildprojectmanager (?) ... step 4 and 5 repeat and interleave... 6. wip/boostbuildprojectmanager builds, runs and is ready for first review Wouldn't the steps in 4. and 5. create noise numerous half-ready Patch Sets? In order to avoid that, shall we move the early collaboration to 'private' clone, e.g. on GitHub and once the contribution is ready for first review, push to Gerrit? Then, if more updates are requested, prepare them on GitHub, once ready, push to Gerrit (as new Patch Set)? The [3] says: "Note that pushing to your private clone does not count as publishing and is a perfectly valid way to solicit an early review", so I guess that use of GitHub for intermediate changes is the way to go, isn't it? [0] http://lists.qt-project.org/pipermail/qt-creator/2015-April/004580.html [1] https://wiki.qt.io/Setting_up_Gerrit [2] https://wiki.qt.io/Gerrit_Introduction [3] https://wiki.qt.io/Commit_Policy Best regards, -- Mateusz Loskot, http://mateusz.loskot.net _______________________________________________ Qt-creator mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/qt-creator
