[Adium-devl] SoC Branches

[Augie Fackler]

On Jul 10, 2007, at 6:11 PM, Evan Schoenberg wrote:

>
> 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?

Sussman is going to help me with that - it'll be all shiny. He tells  
me they have been doing this kind of thing with svn's repo for a long  
time - as long as we maintain good practices (which I'll summarize to  
the list) we won't need merge tracking. Worst case, we use  
svnmerge.py, but we'll see. I'll summarize this once he and I figure  
things out.

>
>> 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).

Yes - the XMPP branch dies. Andy lives on trunk now. :)

Augie

>
> -Evan_______________________________________________
> Adium-devl mailing list
> Adium-devl at adiumx.com
> http://adiumx.com/mailman/listinfo/adium-devl_adiumx.com

-------------- 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/f4a7a546/attachment.sig>