Thread problem causing some calls to hang for 25

[Simon McVittie]

On Thu, 10 Jun 2010 at 15:25:48 +0200, Ralf Habacker wrote:
> Thiago Macieira schrieb:
> >But in doing so, he also merged D-Bus 1.3 into the dbus-1.2 branch.
> Really ?
> Would such a merge not be listed somewhere in the logs ?

What it appears you actually did was to *replace* the server's dbus-1.2 branch
with your local dbus-1.2 branch, which was a copy of master.

Either way, because master is a superset of dbus-1.2, this was considered to
be a "fast forward" merge, so no merge commit appears; by default, git only
creates a commit to represent a merge if it needs to do a non-fast-forward
merge, which results in a merge commit with two (or more) parents.

You'll notice that the log does include commits that weren't intended to be
in 1.2, like "Add an optional PropertiesChanged() signal" from davidz.

    Simon