Re: [java-gnome-hackers] Motion event and eventmask

[Andrew C. <an...@op...>]

On Fri, 2009-05-22 at 22:08 +0000, Vreixo Formoso Lopes wrote:
> ... an improved implementation of enable/disable events.
> The patch also includes ...

So I did a partial merge of Vreixo's 'event-masks' branch. Certainly all
the work exposing EventMask was excellent and that deserved to go in
regardless.

The part I wasn't comfortable with was the enableEvents() /
disableEvent() idea that Vreixo has. In unrelated work I found myself
exposing Widget's setEvents() and addEvents() methods, then remembered
Vreixo had worked on EventMask, and turned to his 'event-mask' branch.
Most of what he wrote for enableEvents() was sound, so I just used that
text for setEvents().

I also merged the MotionNotifyEvent interface and connect() stuff in
Widget.

Since I'm not entirely sure what he was doing that ran him into trouble,
so I'm sure we'll need a bit more [getEvents() + some more Flag stuff?]
to satisfy his need, but I wanted to get the good stuff in so we could
focus on the diff of just the difficult part.

++

I feel like I'm getting better at cherry picking. The trick for the
gatekeeper (me) is to `bzr revert` the bits we're not ready to accept,
then committing the remaining diff as the merge. That means

a) history isn't lost and we DO incorporate code we are ready to accept,

b) future diffs of the contributor's branch against 'mainline' are
smaller.

c) what goes into 'mainline' is clean but requires

d) people contributing branches with work-in-progress like this to then
"revert" when *they* next merge 'mainline' into their own
work-in-progress branch.

That way they keep their changes, (it's not up to me to tell them they
can't have whatever code they want) but they can continue to stay up to
date.

In hindsight, this is what John wrote about here:
http://jam-bazaar.blogspot.com/2009/10/refactoring-work-for-review-and-keep.html

That's not exactly how I manage things, but the basic idea is similar.
Interesting all the same.

++

Anyway, I'll try and warn when I've done a partial merge so that
contributors working on a given feature branch can be aware to be
careful if merging 'mainline'.

Speaking of which, 'event-masks' merged to 'mainline' as at revno 713.

AfC
Sydney