Rockbox.org home
release
dev builds
extras
themes manual
wiki
device status forums
mailing lists
IRC bugs
patches
dev guide



Rockbox mail archive

Subject: Git migration: try out Gerrit!

Git migration: try out Gerrit!

From: Torne Wuff <torne+rockboxdev_at_wolfpuppy.org.uk>
Date: Tue, 21 Jun 2011 12:26:58 +0100

Hi folks,

We're looking at how to host the Rockbox git repository and currently
Gerrit seems like a good choice for that and also for hosting code
reviews. However, I want to make sure committers and other
contributors have a chance to try it out and provide feedback before
we go ahead and actually set up this infrastructure.

There is a demo instance of Gerrit running which some of you have
already had a go with. I have now finished the "demo guide" which you
can read here: http://www.rockbox.org/wiki/GerritDemoGuide
I encourage you all to have a go fairly soon (non-committers who
currently contribute patches via Flyspray may want to try it to: there
are no special permissions needed to access the demo repository, and
if we adopt this you will be able to submit patches for review to the
real Gerrit repository).

One important note (which may not make sense to people not familiar
with git, but that's ok): currently I have configured Gerrit to forbid
pushing merge commits to the master branch. This means that you have
to rebase your changes before you can submit them. This restriction is
not an innate feature of Gerrit, it's a configuration choice which can
be changed; please don't judge the tool because of this. The reason
I've left it in place for now is that forcing rebases makes the submit
workflow more svn-like and prevents less experienced git users from
submitting unnecessarily complicated history. Once we have a real
deployment we will probably allow people to opt themselves in to being
able to upload merges, but we'll probably have some kind of policy on
how you are expected to submit your changes. Please leave discussion
of merge/branch workflow for now; I want to get agreement on the basic
tools first :)

If you have questions or comments you can reply here or come find
people on IRC: a number of committers have already tried the Gerrit
demo (and are familiar with Git) so can probably help you with it, and
I will help if I am around. Please don't email me privately about it,
though :)

Thanks folks,

-- 
Torne Wuff
torne_at_wolfpuppy.org.uk
Received on 2011-06-21

Page was last modified "Jan 10 2012" The Rockbox Crew
aaa