Merging XMPP SoC branch

[John Bailey]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Sean Egan wrote:
> On 7/10/07, Andreas Monitzer <pidgin at monitzer.com> wrote:
>>> Does it add new strings?
>> Yes, esp. user mood has a huge list of strings to be translated.
> 
> Right! String freeze!
> 
> Andy, would you mind if we merged the branch with user-visible
> string-adding features #ifdef'ed out to get the API additions in
> 2.1.0, and then got the new strings in 2.1.1, 3 weeks from now?
> 
> -s.

I don't really see a better place in this thread to insert my two cents, so I'll
note here that 'mtn propagate im.pidgin.soc.2007.xmpp im.pidgin.pidgin' does not
necessarily end the useful life of the xmpp branch.  You can propagate from
branch to branch as many times as you want; the propagate merges the heads of
each branch.  After the propagate, you can continue on both branches as normal
and propagate back and forth afterward.  My point here is that we can propagate
the branch and allow Andreas to continue working as needed in the xmpp branch
should it be necessary.  Further propagates are possible, as the branch is never
really "closed" as we would effectively see in SVN and CVS.

All this said, I'm in favor of merging this now, before 2.1.0, and making an
effort to have at least one purely bugfix release (preferably two or three) after.

John
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFGlEINBWJH/emdNtsRAt8EAKC+ZewcuH/PwYrl7FEOvr/GBSPnDACgpV9w
qx8/rcrMRcsjjnEut5s0jKU=
=G5SJ
-----END PGP SIGNATURE-----