Merging XMPP SoC branch

[Richard Laager]

On Wed, 2007-07-11 at 11:27 -0500, Evan Schoenberg wrote:
> Richard, could you clarify how Andy is 'duplicating code'?

It's fairly minor duplication of some <img> tag stuff in util.c, but I'm
really objecting to the lack of tracking im.pidgin.pidgin with
propagates. Merging as you go is so much easier. Trust me, I've been
there many times.

> If this *is* a problem, perhaps documenting whatever monotone practice
> regarding propagate you (or, more generally, we) are expecting would
> be good?

I've been meaning to write something on this. I'll see what I can do.

> 'early', as Andy mentions in his reply, is simply because the original
> plan was to merge SoC branches at some point after SoC is complete or
> just before that time.

I was interpreting "early" to mean "premature".

Anyway, I've been told I'm sounding more negative than normal, so I
apologize. I didn't mean to come off so harshly.

Richard
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://pidgin.im/pipermail/devel/attachments/20070711/7cbc8d4d/attachment.sig>