Gerrit is now the leader - updated workflow

Hi,

I have finished setting up replication for Gerrit, and have removed push access
to the Github and Gitorious Avogadro repositories. What does this mean? It
means that all changes must go in through Gerrit, and I have updated details
on merging in accepted changes,

http://avogadro.openmolecules.net/wiki/Working_with_Gerrit#Merging_in_accepted_changes

I have tested this out and it seems to work well. I think that Gerrit is a big
step forward for us, and hope to use it in more projects in the future. Please
let me know if you hit any issues.

Thanks,

Marcus

I have finished setting up replication for Gerrit, and have removed push access
to the Github and Gitorious Avogadro repositories. What does this mean? It

Konstantin raised a good point a while ago. Now that we have Gerrit as the official gatekeeper for the main repository, I think others can (and should) use their own GitHub repos for personal development and demonstrations (e.g., to show off incremental progress).

Rather than a pull request, when you’re ready to contribute patches to the main repo, you submit to Gerrit. That’s it. Not too hard.

I personally have felt a little hamstrung when trying to sync code between multiple machines and I intend to use my GitHub repo for this purpose. Obviously, it’s not the master master. :slight_smile:

Cheers,
-Geoff

On Friday 11 June 2010 12:08:31 Geoffrey Hutchison wrote:

I have finished setting up replication for Gerrit, and have removed push
access to the Github and Gitorious Avogadro repositories. What does this
mean? It

Konstantin raised a good point a while ago. Now that we have Gerrit as the
official gatekeeper for the main repository, I think others can (and
should) use their own GitHub repos for personal development and
demonstrations (e.g., to show off incremental progress).

Rather than a pull request, when you’re ready to contribute patches to the
main repo, you submit to Gerrit. That’s it. Not too hard.

I personally have felt a little hamstrung when trying to sync code between
multiple machines and I intend to use my GitHub repo for this purpose.
Obviously, it’s not the master master. :slight_smile:

This sounds reasonable to me. You will need to remember to make topic branches
based off of the Gerrit master (or the synced Github/Gitorious masters). Topic
branches are a much better way to operate, and I am hoping this will make the
workflow simpler. You can easily make a topic branch from the Gerrit master and
cherry pick the commits you want onto that topic branch.

I am here to help if people need it.

Marcus