Attention is currently required from: arehbein.

View Change

1 comment:

• Patchset:

  • Patch Set #1:

    I haven't yet read anything about how WIP-branches are to be used here. […]

    Ah I now see you merged it agains tyour own branch. In any case, that's wrong, you shouldn't use the gerrit UI for that.

    First of all it's important to differentiate 2 use cases:

    • Patches you want to submit for review so that they end up merged in a public branch (ie master).
    • Your own private branches (WIP branches as backup or test against docker)

    The difference stated abose is important, because the first generates content in the gerrit UI (triggers emails, creates patches people can review, etc.) and the second doesn't.

    For the first use case (submitting patches) you use the gerrit specific branching system:
    git push origin HEAD:refs/for/master
    You can even submit a patch to gerrit for early review but mark it as "WIP" in gerrit UI to prevent it from being merged using the gerrit UI (for instance because you still have to do further testing or you are not sure something is 100% correct):
    git push origin HEAD:refs/for/master%wip

    For the second use case gerrit remote as any usual git server. For instance, let's say you are working on osmo-bts.git and you have your local branch "arehbein/foobar" (it's good practice to prefix your branches so that everybody know they are yours, and you are responsible from getting rid of them once you are done).
    Continuing the example, your "origin" remote is going to be probably this one:
    ssh://arehbein@gerrit.osmocom.org:29418/osmo-bts.git
    When you have something to push, you simply do:
    "git push origin arehbein/foobar"
    If the branch already exists in the remote, remember to pass "-f" to force push and hence overwrite it:
    "git push -f origin arehbein/foobar"

To view, visit change 30134. To unsubscribe, or for help writing mail filters, visit settings.