[oe] Reverting recent openmoko commit
zecke at selfish.org
Mon Oct 27 13:45:21 CET 2008
On Monday 27 October 2008 11:37:24 Philip Balister wrote:
> I agree the reversion is an overreaction, but also understand this is
> not the first time this has happened. The messages I noticed that raised
> my eyebrows where some simple changes of description tags. The commit
> message was of the from "[description] Change package description". I
> try (when I have time" to inspect commits that impact stuff I care
> about. Messages of this form force me to read the diff to see what was
The difficulty is. The original above commit touched ~40 recipes, now many of
these changes do not apply because the recipes that are touched changed, are
not there any more, or not yet merged.
I'm basically in this dilemma:
- Copy everything from OM over and have one commit... I personally hate this
as we lose the history of the changes, I don't credit the creators properly. I
hope there is an agreement.
- I could rewrite every commit message. I have to admit I'm too lazy to
spend two weeks in rewriting every single commit message. I would have to
resort to the above which I think is a bad idea.
- I can merge as I did. The changes (at least at the end of the chain)
are sensible and should follow common practices. The commit messages are not
perfect (in the case that they use  instead of :). From the possible options
I see this is the best. As this is crediting people properly (encouraging them
to do more work), it is preserving history (the distance between commits, the
authors, the reasoning is still there) and it is not doing any damage.
Where from here?
- I will merge yesterday's work again as is?
- I will ask our OM developers to use a different style in the commit message
(even if this is not mandated) to not use braces but colons. And yes I think I
asked them to use  as I'm used to this from various other projects, I will
ask them to change and change it myself.
More information about the Openembedded-devel