working towards 1.2.18, and a note for developers

[Colin Walters]

On Thu, Jan 28, 2010 at 4:11 PM, Thiago Macieira <thiago at kde.org> wrote:
>
> Just cherry-pick -x the relevant patches from master to 1.2, then apply the
> new patches from Fedora,

I've pushed to dbus-1.2 a number of crucial patches along with Will's
monitor bits.  Still outstanding is
http://bugs.freedesktop.org/show_bug.cgi?id=21597
I'll wait on BSD people to weigh in there.

> and finally merge everything to master.
>
> Git should resolve the merges easily. Where it doesn't resolve them, cherry-
> picking won't help very much, because you'll also have the conflicts.

The difference with cherry-picking is I know exactly what it will do.
With merge I have to look at both histories and try to figure out what
the algorithm will pick.

Well, merge seemed to work OK, so I went ahead and used that and pushed.