[Adium-devl] [Adium-svn] rev 20208 - branches/summer_of_code_2007/xmpp

[Juan Manuel Palacios]

On Jul 10, 2007, at 12:03 PM, durin42 at adiumx.com wrote:

> Author: durin42
> Date: 2007-07-10 12:03:53 -0400 (Tue, 10 Jul 2007)
> New Revision: 20208
>
> Modified:
>    branches/summer_of_code_2007/xmpp/
> Log:
> Attempting to setup svnmerge.py for use.


	I was so gonna suggest that! (though for the 1.1 branch,  
actually ;-) I recently started using svnmerge.py to manage the  
MacPorts 1.5 release branch per a Subversion developer's  
recommendation and have loved it every since. Sweet tool! It'll allow  
you to keep a handy list of what's been merged already and what still  
requires merging at any moment (cd <your initialized branch> &&  
svnmerge.py avail), plus a separate list of what you don't want to  
merge, so you'll no longer have to keep separate mail boxes holding  
the messages for the commits you plan to merge and another one for  
the commits you don't want (uupppsss, did it sound like I was talking  
about myself just there? ;-)

	Do ping me if you need any pointers, I'm not the most experienced  
out there on svnmerge.py but I might be able shed some light if  
needed. Regards,...


-jmpp


PS: I have some MacPorts developers doing all kinds of fancy stuff,  
like keeping svk and git local repos and pushing their mods up to  
subversion when needed.... but I have only tried svnmerge.py so far  
and I'm pretty comfortable with it. We could also poll their  
experiences at any point, even if for argument's sake.