[Adium-devl] SoC Branches

[Evan Schoenberg]

On Jul 10, 2007, at 4:38 PM, Augie Fackler wrote:

> I'm planning on merging trunk to SoC branches tomorrow. I was going
> to merge it today, but I want to wait so Sussman and I can do some
> real-world tests on his merge stuff for svn 1.5.

How will this work with svn merging?  If you merge trunk to the  
branches, is it then still possible to merge the branches' changes to  
trunk?

> The XMPP branch is on trunk now - it will go away shortly pending
> some changes to the libgaim repo that have been living in the branch.
'it' which will go away is the XMPP branch?  Will Andy be working  
directly in trunk from that point? (Which is fine with me; I'm just  
trying to get a handle on what's being proposed).

-Evan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://adium.im/pipermail/devel_adium.im/attachments/20070710/36d1f165/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 186 bytes
Desc: This is a digitally signed message part
URL: <http://adium.im/pipermail/devel_adium.im/attachments/20070710/36d1f165/attachment.sig>