[Development] Reviews needed before android integration in two weeks

Oswald Buddenhagen oswald.buddenhagen at digia.com
Wed Feb 6 11:35:01 CET 2013


On Wed, Feb 06, 2013 at 09:41:46AM +0100, Paul Olav Tvete wrote:
> On Wednesday 6 February 2013 09:00:41 Thomas McGuire wrote:
> > A workaround would be to squash all commits of the branch together into a 
> > single patch and then upload that to Gerrit for review. Now, actually
> > pushing  the single patch would lose history, so we'd instead manually do a
> > proper merge of the branch. How about we do that for the Android merge?
> 
> That's a great idea! We can push a squashed commit as a WIP to gerrit.
> 
this is a possible workaround for gerrit's failure to display diffs for
merges, yes.
but then, the approach is all wrong anyway.
the basic assumption for mergable branches is that every single commit
in them follows all applicable policies and got proper review (by the
respective experts/maintainers). this is so totally *not* the case for
the android branch.
consequently, eskil already started doing the right thing: extracting
atomic changes and submitting them straight for dev.
this is how the ios and winrt branches are supposed to be handled as
well. that makes these branches throw-away branches, which permits
relaxing the policies.
optionally, rebase the branch on top of dev and continue, possibly
repeatedly. this would have the advantage or reduced duplication of work
- ios and android have many of the same requirements in the build system
area, for example.



More information about the Development mailing list